summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/keygen-test/keygen-test4
-rwxr-xr-xdebian/openssh-client-ssh1.install6
-rwxr-xr-xdebian/rules32
5 files changed, 25 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore
index 3d984650a..11c73eeb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,6 @@
1/*.out 1/*.out
2/Makefile 2/Makefile
3/autom4te.cache 3/autom4te.cache
4/build-deb
5/build-deb-stamp
6/build-udeb
7/build-udeb-stamp
8/buildit.sh 4/buildit.sh
9/buildpkg.sh 5/buildpkg.sh
10/config.cache 6/config.cache
@@ -33,6 +29,9 @@ contrib/gnome-ssh-askpass2
33openbsd-compat/Makefile 29openbsd-compat/Makefile
34debian/*.debhelper* 30debian/*.debhelper*
35debian/*substvars 31debian/*substvars
32debian/build-deb
33debian/build-deb-ssh1
34debian/build-udeb
36debian/files 35debian/files
37debian/keygen-test/key1 36debian/keygen-test/key1
38debian/keygen-test/key1.pub 37debian/keygen-test/key1.pub
diff --git a/debian/changelog b/debian/changelog
index dfcdce75b..ed6013816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:7.3p1-4) UNRELEASED; urgency=medium
2 2
3 * Adjust Build-Depends further to avoid considering libssl-dev >= 1.1.0~ 3 * Adjust Build-Depends further to avoid considering libssl-dev >= 1.1.0~
4 as sufficient. 4 as sufficient.
5 * Move build directories under debian/.
5 6
6 -- Colin Watson <cjwatson@debian.org> Fri, 11 Nov 2016 02:50:39 +0000 7 -- Colin Watson <cjwatson@debian.org> Fri, 11 Nov 2016 02:50:39 +0000
7 8
diff --git a/debian/keygen-test/keygen-test b/debian/keygen-test/keygen-test
index 02b7c761a..2abe815ef 100755
--- a/debian/keygen-test/keygen-test
+++ b/debian/keygen-test/keygen-test
@@ -2,9 +2,9 @@
2 2
3rm -f key1 key1.pub key2 key2.pub 3rm -f key1 key1.pub key2 key2.pub
4LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \ 4LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
5 ../../build-deb/ssh-keygen -N '' -f key1 >/dev/null 5 ../build-deb/ssh-keygen -N '' -f key1 >/dev/null
6LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \ 6LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
7 ../../build-deb/ssh-keygen -N '' -f key2 >/dev/null 7 ../build-deb/ssh-keygen -N '' -f key2 >/dev/null
8if cmp -s key1 key2; then 8if cmp -s key1 key2; then
9 echo "Generated two identical keys!" >&2 9 echo "Generated two identical keys!" >&2
10 exit 1 10 exit 1
diff --git a/debian/openssh-client-ssh1.install b/debian/openssh-client-ssh1.install
index 04e7e0c45..60a8bc58a 100755
--- a/debian/openssh-client-ssh1.install
+++ b/debian/openssh-client-ssh1.install
@@ -1,5 +1,5 @@
1#! /usr/bin/dh-exec 1#! /usr/bin/dh-exec
2 2
3build-deb-ssh1/scp => usr/bin/scp1 3debian/build-deb-ssh1/scp => usr/bin/scp1
4build-deb-ssh1/ssh => usr/bin/ssh1 4debian/build-deb-ssh1/ssh => usr/bin/ssh1
5build-deb-ssh1/ssh-keygen => usr/bin/ssh-keygen1 5debian/build-deb-ssh1/ssh-keygen => usr/bin/ssh-keygen1
diff --git a/debian/rules b/debian/rules
index b5dd9f976..76e71ecf1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,20 +131,20 @@ override_dh_autoreconf-arch:
131override_dh_autoreconf-indep: 131override_dh_autoreconf-indep:
132 132
133override_dh_auto_configure-arch: 133override_dh_auto_configure-arch:
134 dh_auto_configure -Bbuild-deb -- $(confflags) 134 dh_auto_configure -Bdebian/build-deb -- $(confflags)
135 dh_auto_configure -Bbuild-deb-ssh1 -- $(confflags) --with-ssh1 135 dh_auto_configure -Bdebian/build-deb-ssh1 -- $(confflags) --with-ssh1
136 dh_auto_configure -Bbuild-udeb -- $(confflags_udeb) 136 dh_auto_configure -Bdebian/build-udeb -- $(confflags_udeb)
137 137
138override_dh_auto_configure-indep: 138override_dh_auto_configure-indep:
139 139
140override_dh_auto_build-arch: 140override_dh_auto_build-arch:
141 # Avoid libnsl linkage. Ugh. 141 # Avoid libnsl linkage. Ugh.
142 perl -pi -e 's/ +-lnsl//' build-udeb/config.status 142 perl -pi -e 's/ +-lnsl//' debian/build-udeb/config.status
143 cd build-udeb && ./config.status 143 cd debian/build-udeb && ./config.status
144 144
145 $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' 145 $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
146 $(MAKE) -C build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen 146 $(MAKE) -C debian/build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen
147 $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen 147 $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
148 148
149 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) 149 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
150 150
@@ -152,32 +152,32 @@ override_dh_auto_build-indep:
152 152
153override_dh_auto_test-arch: 153override_dh_auto_test-arch:
154ifeq ($(RUN_TESTS),yes) 154ifeq ($(RUN_TESTS),yes)
155 $(MAKE) -C build-deb regress-prep 155 $(MAKE) -C debian/build-deb regress-prep
156 $(MAKE) -C build-deb $(PARALLEL) \ 156 $(MAKE) -C debian/build-deb $(PARALLEL) \
157 regress/unittests/sshbuf/test_sshbuf \ 157 regress/unittests/sshbuf/test_sshbuf \
158 regress/unittests/sshkey/test_sshkey \ 158 regress/unittests/sshkey/test_sshkey \
159 regress/unittests/bitmap/test_bitmap \ 159 regress/unittests/bitmap/test_bitmap \
160 regress/unittests/hostkeys/test_hostkeys \ 160 regress/unittests/hostkeys/test_hostkeys \
161 regress/unittests/kex/test_kex 161 regress/unittests/kex/test_kex
162 $(MAKE) -C build-deb/regress \ 162 $(MAKE) -C debian/build-deb/regress \
163 .OBJDIR="$(CURDIR)/build-deb/regress" \ 163 .OBJDIR="$(CURDIR)/debian/build-deb/regress" \
164 .CURDIR="$(CURDIR)/regress" \ 164 .CURDIR="$(CURDIR)/regress" \
165 unit 165 unit
166 $(MAKE) -C build-deb compat-tests 166 $(MAKE) -C debian/build-deb compat-tests
167 $(MAKE) -C debian/keygen-test 167 $(MAKE) -C debian/keygen-test
168endif 168endif
169 169
170override_dh_auto_test-indep: 170override_dh_auto_test-indep:
171 171
172override_dh_auto_clean: 172override_dh_auto_clean:
173 rm -rf build-deb build-deb-ssh1 build-udeb 173 rm -rf debian/build-deb debian/build-deb-ssh1 debian/build-udeb
174ifeq ($(RUN_TESTS),yes) 174ifeq ($(RUN_TESTS),yes)
175 $(MAKE) -C debian/keygen-test clean 175 $(MAKE) -C debian/keygen-test clean
176endif 176endif
177 $(MAKE) -C contrib clean 177 $(MAKE) -C contrib clean
178 178
179override_dh_auto_install-arch: 179override_dh_auto_install-arch:
180 $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys 180 $(MAKE) -C debian/build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
181 181
182override_dh_auto_install-indep: 182override_dh_auto_install-indep:
183 183
@@ -186,7 +186,7 @@ override_dh_install-arch:
186 186
187 dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing 187 dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
188 dh_install -popenssh-client-udeb -popenssh-server-udeb \ 188 dh_install -popenssh-client-udeb -popenssh-server-udeb \
189 --sourcedir=build-udeb 189 --sourcedir=debian/build-udeb
190 190
191 # Remove version control tags to avoid unnecessary conffile 191 # Remove version control tags to avoid unnecessary conffile
192 # resolution steps for administrators. 192 # resolution steps for administrators.