summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-01-25 13:14:24 +0000
committerColin Watson <cjwatson@debian.org>2010-01-25 13:14:24 +0000
commit50f4d41069fe59dddfedf372e6c2fc790c119837 (patch)
tree410720c96cbdc7afbed174295111501ff876a21d
parent02d776600121afc31658f3b857ab9d41c7cad5ca (diff)
Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system
calls. This only applied to Linux 2.2, which it's no longer feasible to run anyway (see 1:5.2p1-2 changelog).
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/rules4
2 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index ed90f6561..af04c72d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ openssh (1:5.3p1-1) UNRELEASED; urgency=low
8 ...) when the agent refuses the constrained add request. This was a 8 ...) when the agent refuses the constrained add request. This was a
9 useful migration measure back in 2002 when constraints were new, but 9 useful migration measure back in 2002 when constraints were new, but
10 just adds risk now (LP: #209447). 10 just adds risk now (LP: #209447).
11 * Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system
12 calls. This only applied to Linux 2.2, which it's no longer feasible to
13 run anyway (see 1:5.2p1-2 changelog).
11 14
12 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jan 2010 22:32:25 +0000 15 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jan 2010 22:32:25 +0000
13 16
diff --git a/debian/rules b/debian/rules
index 618525636..09b8771b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,10 +119,6 @@ build-deb-stamp:
119 mkdir -p build-deb 119 mkdir -p build-deb
120 cd build-deb && ../configure $(confflags) 120 cd build-deb && ../configure $(confflags)
121 121
122ifeq ($(DEB_HOST_ARCH_OS),linux)
123 # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999).
124 perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h
125endif
126 # Debian's /var/log/btmp has inappropriate permissions. 122 # Debian's /var/log/btmp has inappropriate permissions.
127 perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h 123 perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h
128 124