Mercurial > dropbear

changeset 549:7f552ea5bf72 maemo

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '3450609f92928775614418f40dd44ed5393d9de4' and '6a58c90036c543b4d992489843a999156f665e61'
author Matt Johnston <matt@ucc.asn.au>
date Wed, 01 Jul 2009 05:14:51 +0000
parents b0668a7f76d9 (current diff) 9f5e2616c064 (diff)
children
files debian/rules
diffstat 4 files changed, 82 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/debian/changelog	Wed Jul 01 05:14:05 2009 +0000
+++ b/debian/changelog	Wed Jul 01 05:14:51 2009 +0000
@@ -1,3 +1,21 @@
+dropbear (0.52-2) unstable; urgency=low
+
+  * Make key utils part of dropbear-server package (since it's
+  required anyway, single binary saves space), rename -common to
+  -keyutils
+  * Don't make clean between builds, just rm *.o since only
+  top-level files change
+
+ -- Matt Johnston <[email protected]>  Wed, 19 Nov 2008 21:54:00 +0900
+
+dropbear (0.52-1) unstable; urgency=low
+
+  * Maemo port, split into 5 packages
+  (dropbear, dropbear-server, dropbear-client, dropbear-common, dropbear-scp).
+  This avoids conflicts with openssh package.
+
+ -- Matt Johnston <[email protected]>  Wed, 19 Nov 2008 20:54:00 +0900
+
 dropbear (0.52-0.1) unstable; urgency=low
 
   * New upstream release.
--- a/debian/control	Wed Jul 01 05:14:05 2009 +0000
+++ b/debian/control	Wed Jul 01 05:14:51 2009 +0000
@@ -1,5 +1,5 @@
 Source: dropbear
-Section: net
+Section: user/network
 Priority: optional
 Maintainer: Matt Johnston <[email protected]>
 Build-Depends: libz-dev
@@ -9,7 +9,9 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: openssh-client, runit
-Conflicts: dropbear-server, dropbear-client, dropbear-common, dropbear-scp
+Section: user/network
+Conflicts: dropbear-server, dropbear-client, dropbear-keyutils, dropbear-scp
+XB-Maemo-Display-Name: Dropbear SSH Client and Server
 Description: lightweight SSH2 server and client
  dropbear is a SSH 2 server and client designed to be small enough to
  be used in small memory environments, while still being functional and
@@ -18,14 +20,19 @@
  It implements most required features of the SSH 2 protocol, and other
  features such as X11 and authentication agent forwarding.
  .
- This packages provides Dropbear client and server as a single binary.
+ This package provides Dropbear client and server as a single binary,
+ as well as key utilities and SCP.
  .
  See http://matt.ucc.asn.au/dropbear/dropbear.html
 
 Package: dropbear-server
 Architecture: any
-Depends: ${shlibs:Depends}, dropbear-common
+Depends: ${shlibs:Depends}
+Section: user/network
+Conflicts: dropbear, dropbear-keyutils
+Provides: dropbear-keyutils
 Recommends: dropbear-scp
+XB-Maemo-Display-Name: Dropbear SSH Server
 Description: lightweight SSH2 server
  dropbear is a SSH 2 server and client designed to be small enough to
  be used in small memory environments, while still being functional and
@@ -34,12 +41,18 @@
  It implements most required features of the SSH 2 protocol, and other
  features such as X11 and authentication agent forwarding.
  .
+ This package provides only the Dropbear server.
+ .
  See http://matt.ucc.asn.au/dropbear/dropbear.html
 
 Package: dropbear-client
 Architecture: any
+Conflicts: dropbear
+Section: user/network
 Depends: ${shlibs:Depends}
-Recommends: dropbear-common, dropbear-scp
+Recommends: dropbear-scp
+Suggests: dropbear-keyutils
+XB-Maemo-Display-Name: Dropbear SSH Client
 Description: lightweight SSH2 client
  dropbear is a SSH 2 server and client designed to be small enough to
  be used in small memory environments, while still being functional and
@@ -48,10 +61,15 @@
  It implements most required features of the SSH 2 protocol, and other
  features such as X11 and authentication agent forwarding.
  .
+ This package provides only the Dropbear client.
+ .
  See http://matt.ucc.asn.au/dropbear/dropbear.html
 
-Package: dropbear-common
+Package: dropbear-keyutils
 Architecture: any
+Conflicts: dropbear, dropbear-server
+Section: user/network
+XB-Maemo-Display-Name: Dropbear SSH Key Utils
 Depends: ${shlibs:Depends}
 Description: lightweight SSH2, key management utilities
  dropbear is a SSH 2 server and client designed to be small enough to
@@ -65,6 +83,9 @@
 
 Package: dropbear-scp
 Architecture: any
+Section: user/network
+Conflicts: dropbear
+XB-Maemo-Display-Name: Dropbear SCP
 Depends: ${shlibs:Depends}
 Description: lightweight SSH2 scp
  dropbear is a SSH 2 server and client designed to be small enough to
--- a/debian/dropbear.init	Wed Jul 01 05:14:05 2009 +0000
+++ b/debian/dropbear.init	Wed Jul 01 05:14:51 2009 +0000
@@ -38,7 +38,7 @@
 
 case "$1" in
   start)
-	test "$NO_START" = "0" || cancel 'NO_START is not set to zero.'
+	test "$NO_START" = "0" || cancel '/etc/default/dropbear NO_START is set, Dropbear will not run.'
 	echo -n "Starting $DESC: "
 	start-stop-daemon --start --quiet --pidfile /var/run/"$NAME".pid \
 	  --exec "$DAEMON" -- -d "$DROPBEAR_DSSKEY" -r "$DROPBEAR_RSAKEY" \
@@ -51,7 +51,7 @@
 	echo "$NAME."
 	;;
   restart|force-reload)
-	test "$NO_START" = "0" || cancel 'NO_START is not set to zero.'
+	test "$NO_START" = "0" || cancel '/etc/default/dropbear NO_START is set, Dropbear will not run.'
 	echo -n "Restarting $DESC: "
 	start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/"$NAME".pid
 	sleep 1
--- a/debian/rules	Wed Jul 01 05:14:05 2009 +0000
+++ b/debian/rules	Wed Jul 01 05:14:51 2009 +0000
@@ -37,6 +37,7 @@
 	    --build='$(DEB_BUILD_GNU_TYPE)' --prefix=/usr \
 	    --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 	    $(CONFFLAGS)
+	$(MAKE) clean
 
 build: deb-checkdir build-stamp
 build-stamp: config.status
@@ -55,19 +56,25 @@
 	rm -rf '$(DIR)'
 	rm -rf '$(DIR)'-client
 	rm -rf '$(DIR)'-server
-	rm -rf '$(DIR)'-common
+	rm -rf '$(DIR)'-keyutils
 	rm -rf '$(DIR)'-scp
 	rm -f debian/files debian/substvars debian/copyright changelog
 
 install-server: DIR=$(shell pwd)/debian/dropbear-server
 install-server: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
-	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS=dropbear dropbear
+	rm *.o
+	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS="dropbear dropbearkey dropbearconvert" MULTI=1
 	install -d -m0755 '$(DIR)'/etc/dropbear
 	# programs
+	install -d -m0755 '$(DIR)'/usr/bin
 	install -d -m0755 '$(DIR)'/usr/sbin
-	install -m0755 dropbear '$(DIR)'/usr/sbin/dropbear
+	install -d -m0755 '$(DIR)'/usr/lib/dropbear
+	install -m0755 dropbearmulti \
+	  '$(DIR)'/usr/lib/dropbear/dropbearmulti
+	ln -s ../lib/dropbear/dropbearmulti '$(DIR)'/usr/bin/dropbearkey
+	ln -s ../lib/dropbear/dropbearmulti '$(DIR)'/usr/sbin/dropbear
+	ln -s dropbearmulti '$(DIR)'/usr/lib/dropbear/dropbearconvert
 	# init and run scripts
 	install -d -m0755 '$(DIR)'/etc/init.d
 	install -m0755 debian/dropbear.init '$(DIR)'/etc/init.d/dropbear
@@ -83,18 +90,16 @@
 	# copyright, changelog
 	cat debian/copyright.in LICENSE > debian/copyright
 	test -r changelog || ln -s CHANGES changelog
-	$(STRIP) -R .comment -R .note '$(DIR)'/usr/sbin/*
+	$(STRIP) -R .comment -R .note '$(DIR)'/usr/lib/dropbear/*
 
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
-	  dpkg-shlibdeps '$(DIR)'/usr/sbin/*
-	dpkg-gencontrol -isp -pdropbear-server -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
+	  dpkg-shlibdeps '$(DIR)'/usr/lib/dropbear/*
 
 install-client: DIR=$(shell pwd)/debian/dropbear-client
 install-client: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
+	rm *.o
 	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS=dbclient dbclient
 	install -d -m0755 '$(DIR)'/usr/bin
 	install -m0755 dbclient '$(DIR)'/usr/bin/dbclient
@@ -106,13 +111,11 @@
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
 	  dpkg-shlibdeps  '$(DIR)'/usr/bin/*
-	dpkg-gencontrol -isp -pdropbear-client -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
 
-install-common: DIR=$(shell pwd)/debian/dropbear-common
-install-common: deb-checkdir deb-checkuid config.status 
+install-keyutils: DIR=$(shell pwd)/debian/dropbear-keyutils
+install-keyutils: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
+	rm *.o
 	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS="dropbearkey dropbearconvert" MULTI=1
 	install -d -m0755 '$(DIR)'/usr/bin
 	install -d -m0755 '$(DIR)'/usr/lib/dropbear
@@ -126,18 +129,16 @@
 	done
 	gzip -9 '$(DIR)'/usr/share/man/man8/*.8
 	$(STRIP) -R .comment -R .note \
-	  '$(DIR)'/usr/bin/* '$(DIR)'/usr/lib/dropbear/*
+	   '$(DIR)'/usr/lib/dropbear/*
 
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
-	  dpkg-shlibdeps '$(DIR)'/usr/bin/*  '$(DIR)'/usr/lib/dropbear/*
-	dpkg-gencontrol -isp -pdropbear-common -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
+	  dpkg-shlibdeps '$(DIR)'/usr/lib/dropbear/*
 
 install-scp: DIR=$(shell pwd)/debian/dropbear-scp
 install-scp: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
+	rm *.o
 	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS="scp" scp 
 	install -d -m0755 '$(DIR)'/usr/bin
 	install -m0755 scp '$(DIR)'/usr/bin/scp
@@ -146,13 +147,11 @@
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
 	  dpkg-shlibdeps '$(DIR)'/usr/bin/* 
-	dpkg-gencontrol -isp -pdropbear-scp -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
 
 install-multi: DIR=$(shell pwd)/debian/dropbear
 install-multi: deb-checkdir deb-checkuid config.status 
 	rm -f '$(DIR)'
-	$(MAKE) clean
+	rm *.o
 	$(MAKE) CC='$(CC)' LD='$(LD)' PROGRAMS="dropbearkey dropbearconvert scp dropbear dbclient" MULTI=1
 	install -d -m0755 '$(DIR)'/etc/dropbear
 	# programs
@@ -181,20 +180,26 @@
 	install -d -m0755 '$(DIR)'/usr/share/man/man1
 	install -m644 dbclient.1 '$(DIR)'/usr/share/man/man1/
 	gzip -9 '$(DIR)'/usr/share/man/man1/*.1
-	$(STRIP) -R .comment -R .note '$(DIR)'/usr/sbin/* \
-	  '$(DIR)'/usr/bin/* '$(DIR)'/usr/lib/dropbear/*
+	$(STRIP) -R .comment -R .note '$(DIR)'/usr/lib/dropbear/*
 
 	install -d -m0755 '$(DIR)'/DEBIAN
 	test '$(CC)' != 'gcc' || \
-	  dpkg-shlibdeps '$(DIR)'/usr/sbin/* '$(DIR)'/usr/bin/* \
-	    '$(DIR)'/usr/lib/dropbear/*
-	dpkg-gencontrol -isp -pdropbear -P'$(DIR)'
-	dpkg -b '$(DIR)' ..
+	  dpkg-shlibdeps '$(DIR)'/usr/lib/dropbear/*
 
-install: install-client install-server install-common install-multi install-scp
+install: install-client install-server install-keyutils install-multi install-scp
 binary-indep:
 
-binary-arch: install dropbear.deb dropbear-server.deb dropbear-common.deb dropbear-scp.deb dropbear-client.deb
+binary-arch: install dropbear.deb dropbear-server.deb dropbear-keyutils.deb dropbear-scp.deb dropbear-client.deb
+	dpkg-gencontrol -isp -pdropbear -P'$(shell pwd)/debian'/dropbear
+	dpkg-gencontrol -isp -pdropbear-server -P'$(shell pwd)/debian'/dropbear-server
+	dpkg-gencontrol -isp -pdropbear-client -P'$(shell pwd)/debian'/dropbear-client
+	dpkg-gencontrol -isp -pdropbear-keyutils -P'$(shell pwd)/debian'/dropbear-keyutils
+	dpkg-gencontrol -isp -pdropbear-scp -P'$(shell pwd)/debian'/dropbear-scp
+	dpkg -b '$(shell pwd)/debian'/dropbear ..
+	dpkg -b '$(shell pwd)/debian'/dropbear-server ..
+	dpkg -b '$(shell pwd)/debian'/dropbear-keyutils ..
+	dpkg -b '$(shell pwd)/debian'/dropbear-scp ..
+	dpkg -b '$(shell pwd)/debian'/dropbear-client ..
 
 binary: binary-arch binary-indep