mirror of
				https://github.com/clearml/dropbear
				synced 2025-06-26 18:17:32 +00:00 
			
		
		
		
	* patch up to date with debian 0.45-3 diff
--HG-- extra : convert_revision : d0935a5d91dac334274693f8d9cd7ae6fd8c2c31
This commit is contained in:
		
							parent
							
								
									e903109d9f
								
							
						
					
					
						commit
						03731c723b
					
				
							
								
								
									
										73
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										73
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							| @ -1,53 +1,54 @@ | ||||
| dropbear (0.45-1) unstable; urgency=high | ||||
| dropbear (0.45-3) unstable; urgency=low | ||||
| 
 | ||||
|   * New upstream release, various fixes. | ||||
|   * debian/dropbear.init: init script prints human readable message in case | ||||
|     it's disabled (closes: #309099). | ||||
|   * debian/dropbear.postinst: configure: restart service through init script | ||||
|     instead of start. | ||||
|   * debian/dropbear.prerm: set -u -> set -e. | ||||
| 
 | ||||
|  -- Matt Johnston <matt@ucc.asn.au>  Mon, 7 March 2005 00:44:54 +0800 | ||||
|  -- Gerrit Pape <pape@smarden.org>  Wed, 25 May 2005 22:38:17 +0000 | ||||
| 
 | ||||
| dropbear (0.44+final-1) unstable; urgency=high | ||||
| dropbear (0.45-2) unstable; urgency=low | ||||
| 
 | ||||
|   * New upstream release, various fixes. | ||||
|   * Matt Johnston: | ||||
|     * New upstream release, various fixes. | ||||
| 
 | ||||
|  -- Matt Johnston <matt@ucc.asn.au>  Mon, 3 January 2005 00:44:54 +0800 | ||||
|  -- Gerrit Pape <pape@smarden.org>  Sat, 12 Mar 2005 15:17:55 +0000 | ||||
| 
 | ||||
| dropbear (0.44test4-1) unstable; urgency=medium | ||||
| dropbear (0.44-1) unstable; urgency=low | ||||
| 
 | ||||
|   * New upstream beta, various useful fixes. | ||||
|   * New upstream release. | ||||
|   * debian/rules: install /usr/bin/dbclient; handle possible patches more | ||||
|     gracefully; install debian/dbclient.1 man page; enable target patch; | ||||
|     minor. | ||||
|   * debian/implicit: update to revision 1.10. | ||||
|   * debian/dbclient.1: new; man page. | ||||
|   * debian/diff/dbclient-usage-typo.diff: new; fix typo. | ||||
|   * debian/diff/manpages.diff: new; add references to dbclient man page. | ||||
| 
 | ||||
|  -- Matt Johnston <matt@ucc.asn.au>  Tues, 14 September 2004 21:20:00 +0800 | ||||
|  -- Gerrit Pape <pape@smarden.org>  Sat,  8 Jan 2005 22:50:43 +0000 | ||||
| 
 | ||||
| dropbear (0.44test3-1) unstable; urgency=medium | ||||
| dropbear (0.43-2) unstable; urgency=high | ||||
| 
 | ||||
|   * New upstream beta, various useful fixes. | ||||
|   * Matt Johnston: | ||||
|     * New upstream release 0.43 | ||||
|     * SECURITY: Don't attempt to free uninitialised buffers in DSS verification | ||||
|       code | ||||
|     * Handle portforwarding to servers which don't send any initial data | ||||
|       (Closes: #258426) | ||||
|   * debian/dropbear.postinst: remove code causing bothersome warning on | ||||
|     package install (closes: #256752). | ||||
|   * debian/README.Debian.diet: new; how to build with the diet libc. | ||||
|   * debian/dropbear.docs: add debian/README.Debian.diet. | ||||
|   * debian/rules: support "diet" in DEB_BUILD_OPTIONS; minor cleanup. | ||||
| 
 | ||||
|  -- Matt Johnston <matt@ucc.asn.au>  Fri, 27 August 2004 22:20:00 +0800 | ||||
| 
 | ||||
| dropbear (0.44test2-1) unstable; urgency=low | ||||
| 
 | ||||
|   * New upstream beta, various minor fixes. | ||||
| 
 | ||||
|  -- Matt Johnston <matt@ucc.asn.au>  Tues, 17 August 2004 19:00:00 +0800 | ||||
| 
 | ||||
| dropbear (0.44test1-1) unstable; urgency=low | ||||
| 
 | ||||
|   * Upstream beta 0.44test1 | ||||
|   * Huge changes to allow client functionality | ||||
| 
 | ||||
|  -- Matt Johnston <matt@ucc.asn.au>  Sat, 14 August 2004 23:00:00 +0800 | ||||
| 
 | ||||
| dropbear (0.43-1) unstable; urgency=high | ||||
| 
 | ||||
|   * New upstream release 0.43 | ||||
|   * SECURITY: Don't attempt to free uninitialised buffers in DSS verification | ||||
|     code | ||||
|   * Handle portforwarding to servers which don't send any initial data | ||||
|     (Closes: #258426) | ||||
| 
 | ||||
|  -- Matt Johnston <matt@ucc.asn.au>  Fri, 16 July 2004 17:44:54 +0800 | ||||
|  -- Gerrit Pape <pape@smarden.org>  Sat, 17 Jul 2004 19:31:19 +0000 | ||||
| 
 | ||||
| dropbear (0.42-1) unstable; urgency=low | ||||
| 
 | ||||
|   * New upstream release 0.42 | ||||
|   * New upstream release 0.42. | ||||
|   * debian/diff/cvs-20040520.diff: remove; obsolete. | ||||
|   * debian/rules: disable target patch. | ||||
| 
 | ||||
|  -- Matt Johnston <matt@ucc.asn.au>  Wed, 16 June 2004 12:44:54 +0800 | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										1
									
								
								debian/dropbear.docs
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/dropbear.docs
									
									
									
									
										vendored
									
									
								
							| @ -1,3 +1,4 @@ | ||||
| README | ||||
| TODO | ||||
| debian/README.runit | ||||
| debian/README.Debian.diet | ||||
|  | ||||
							
								
								
									
										8
									
								
								debian/dropbear.init
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								debian/dropbear.init
									
									
									
									
										vendored
									
									
								
							| @ -14,10 +14,12 @@ NO_START=0 | ||||
| 
 | ||||
| set -e | ||||
| 
 | ||||
| cancel() { echo "$1" >&2; exit 0; }; | ||||
| test ! -r /etc/default/dropbear || . /etc/default/dropbear | ||||
| test "$NO_START" = "0" || exit 0 | ||||
| test -x "$DAEMON" || exit 0 | ||||
| test ! -h /var/service/dropbear || exit 0 | ||||
| test "$NO_START" = "0" || cancel 'NO_START is not set to zero.' | ||||
| test -x "$DAEMON" || cancel "$DAEMON does not exist or is not executable." | ||||
| test ! -h /var/service/dropbear || \ | ||||
|   cancel '/var/service/dropbear exists, service is controlled through runit.' | ||||
| 
 | ||||
| test -z "$DROPBEAR_BANNER" || \ | ||||
|   DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER" | ||||
|  | ||||
							
								
								
									
										5
									
								
								debian/dropbear.postinst
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								debian/dropbear.postinst
									
									
									
									
										vendored
									
									
								
							| @ -2,7 +2,6 @@ | ||||
| set -e | ||||
| 
 | ||||
| test "$1" = 'configure' || exit 0 | ||||
| test -n "$2" || chown log /etc/dropbear/log/main || true | ||||
| 
 | ||||
| if test ! -e /etc/dropbear/dropbear_rsa_host_key; then | ||||
|   if test -f /etc/ssh/ssh_host_rsa_key; then | ||||
| @ -61,8 +60,8 @@ fi | ||||
| if test -x /etc/init.d/dropbear; then | ||||
|   update-rc.d dropbear defaults >/dev/null | ||||
|   if test -x /usr/sbin/invoke-rc.d; then | ||||
|     invoke-rc.d dropbear start | ||||
|     invoke-rc.d dropbear restart | ||||
|   else | ||||
|     /etc/init.d/dropbear start | ||||
|     /etc/init.d/dropbear restart | ||||
|   fi | ||||
| fi | ||||
|  | ||||
							
								
								
									
										2
									
								
								debian/dropbear.prerm
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/dropbear.prerm
									
									
									
									
										vendored
									
									
								
							| @ -1,5 +1,5 @@ | ||||
| #!/bin/sh | ||||
| set -u | ||||
| set -e | ||||
| 
 | ||||
| test "$1" = 'remove' || test "$1" = 'deconfigure' || exit 0 | ||||
| if test -x /etc/init.d/dropbear; then | ||||
|  | ||||
							
								
								
									
										12
									
								
								debian/implicit
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								debian/implicit
									
									
									
									
										vendored
									
									
								
							| @ -1,4 +1,4 @@ | ||||
| # $Id: implicit,v 1.1 2004/06/16 05:08:32 matt Exp $ | ||||
| # $Id: implicit,v 1.10 2004/07/03 15:20:00 pape Exp $ | ||||
| 
 | ||||
| .PHONY: deb-checkdir deb-checkuid | ||||
| 
 | ||||
| @ -12,6 +12,10 @@ deb-checkuid: | ||||
| 	  $*.deb-docs-docs $*.deb-docs-examples $*.deb-DEBIAN \ | ||||
| 	  $*.deb-DEBIAN-dir $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums | ||||
| 
 | ||||
| %.udeb: %.deb-DEBIAN | ||||
| 	@rm -f $*.deb $*.deb-checkdir $*.deb-DEBIAN $*.deb-DEBIAN-dir \ | ||||
| 	  $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums | ||||
| 
 | ||||
| %.deb-checkdir: | ||||
| 	@test -d debian/$* || sh -cx '! : directory debian/$* missing' | ||||
| 	@test "`id -u`" -eq 0 || sh -cx '! : need root privileges' | ||||
| @ -29,6 +33,8 @@ deb-checkuid: | ||||
| 	@test -r debian/$*/usr/share/doc/$*/changelog || \ | ||||
| 	  sh -cx 'mv debian/$*/usr/share/doc/$*/changelog.Debian \ | ||||
| 	    debian/$*/usr/share/doc/$*/changelog' | ||||
| 	@test -s debian/$*/usr/share/doc/$*/changelog || \ | ||||
| 	  sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog' | ||||
| 	@gzip -9 debian/$*/usr/share/doc/$*/changelog* | ||||
| %.deb-docs-docs: | ||||
| 	@for i in `cat debian/$*.docs 2>/dev/null || :`; do \ | ||||
| @ -58,13 +64,13 @@ deb-checkuid: | ||||
| 	@rm -rf debian/$*/DEBIAN | ||||
| 	: debian/$*/DEBIAN/ | ||||
| 	@install -d -m0755 debian/$*/DEBIAN | ||||
| 	@for i in conffiles shlibs; do \ | ||||
| 	@for i in conffiles shlibs templates; do \ | ||||
| 	  test ! -r debian/$*.$$i || \ | ||||
| 	    sh -cx "install -m0644 debian/$*.$$i debian/$*/DEBIAN/$$i" \ | ||||
| 	      || exit 1; \ | ||||
| 	done | ||||
| %.deb-DEBIAN-scripts: | ||||
| 	@for i in preinst prerm postinst postrm; do \ | ||||
| 	@for i in preinst prerm postinst postrm config; do \ | ||||
| 	  test ! -r debian/$*.$$i || \ | ||||
| 	    sh -cx "install -m0755 debian/$*.$$i debian/$*/DEBIAN/$$i" \ | ||||
| 	      || exit 1; \ | ||||
|  | ||||
							
								
								
									
										90
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										90
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							| @ -16,79 +16,89 @@ else | ||||
|   CFLAGS +=-O2 | ||||
| endif | ||||
| 
 | ||||
| CONFFLAGS = | ||||
| CC =gcc | ||||
| ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS))) | ||||
|   CC =diet -v -Os gcc | ||||
|   CONFFLAGS =--disable-zlib | ||||
|   CC =diet -v -Os gcc -nostdinc | ||||
| endif | ||||
| 
 | ||||
| DIR=`pwd`/debian/dropbear | ||||
| DIR =$(shell pwd)/debian/dropbear | ||||
| 
 | ||||
| patch: deb-checkdir patch-stamp | ||||
| patch-stamp: | ||||
| #	no patches for now | ||||
| #	for i in debian/diff/*.diff; do patch -p0 <$$i || exit 1; done | ||||
| 	for i in `ls -1 debian/diff/*.diff || :`; do \ | ||||
| 	  patch -p0 <$$i || exit 1; \ | ||||
| 	done | ||||
| 	touch patch-stamp | ||||
| 
 | ||||
| config.status: patch-stamp configure | ||||
| 	CFLAGS="$(CFLAGS)"' -DSFTPSERVER_PATH="\"/usr/lib/sftp-server\""' \ | ||||
| 	  ./configure --host="$(DEB_HOST_GNU_TYPE)" \ | ||||
| 	    --build="$(DEB_BUILD_GNU_TYPE)" --prefix=/usr \ | ||||
| 	    --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info | ||||
| 	CC='$(CC)' \ | ||||
| 	CFLAGS='$(CFLAGS)'' -DSFTPSERVER_PATH="\"/usr/lib/sftp-server\""' \ | ||||
| 	  ./configure --host='$(DEB_HOST_GNU_TYPE)' \ | ||||
| 	    --build='$(DEB_BUILD_GNU_TYPE)' --prefix=/usr \ | ||||
| 	    --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ | ||||
| 	    $(CONFFLAGS) | ||||
| 
 | ||||
| build: deb-checkdir build-stamp | ||||
| build-stamp: config.status | ||||
| 	$(MAKE) CC="$(CC)" LD="$(CC)" | ||||
| 	$(MAKE) CC='$(CC)' LD='$(CC)' | ||||
| 	touch build-stamp | ||||
| 
 | ||||
| clean: deb-checkdir deb-checkuid | ||||
| 	-$(MAKE) distclean | ||||
| #	test ! -e patch-stamp || \ | ||||
| #	  for i in debian/diff/*.diff; do patch -p0 -R <$$i; done | ||||
| 	test ! -e patch-stamp || \ | ||||
| 	  for i in `ls -1r debian/diff/*.diff || :`; do \ | ||||
| 	    patch -p0 -R <$$i; \ | ||||
| 	  done | ||||
| 	rm -f patch-stamp build-stamp config.log config.status | ||||
| 	rm -rf "$(DIR)" | ||||
| 	rm -rf '$(DIR)' | ||||
| 	rm -f debian/files debian/substvars debian/copyright changelog | ||||
| 
 | ||||
| install: deb-checkdir deb-checkuid build-stamp | ||||
| 	rm -rf "$(DIR)" | ||||
| 	install -d -m0755 "$(DIR)"/etc/dropbear | ||||
| 	rm -rf '$(DIR)' | ||||
| 	install -d -m0755 '$(DIR)'/etc/dropbear | ||||
| 	# programs | ||||
| 	install -d -m0755 "$(DIR)"/usr/sbin | ||||
| 	install -m0755 dropbear "$(DIR)"/usr/sbin/dropbear | ||||
| 	install -d -m0755 "$(DIR)"/usr/bin | ||||
| 	install -m0755 dbclient "$(DIR)"/usr/bin/dbclient | ||||
| 	install -m0755 dropbearkey "$(DIR)"/usr/bin/dropbearkey | ||||
| 	install -d -m0755 "$(DIR)"/usr/lib/dropbear | ||||
| 	install -d -m0755 '$(DIR)'/usr/sbin | ||||
| 	install -m0755 dropbear '$(DIR)'/usr/sbin/dropbear | ||||
| 	install -d -m0755 '$(DIR)'/usr/bin | ||||
| 	install -m0755 dbclient '$(DIR)'/usr/bin/dbclient | ||||
| 	install -m0755 dropbearkey '$(DIR)'/usr/bin/dropbearkey | ||||
| 	install -d -m0755 '$(DIR)'/usr/lib/dropbear | ||||
| 	install -m0755 dropbearconvert \ | ||||
| 	  "$(DIR)"/usr/lib/dropbear/dropbearconvert | ||||
| 	$(STRIP) -R .comment -R .note "$(DIR)"/usr/sbin/* \ | ||||
| 	  "$(DIR)"/usr/bin/* "$(DIR)"/usr/lib/dropbear/* | ||||
| 	  '$(DIR)'/usr/lib/dropbear/dropbearconvert | ||||
| 	$(STRIP) -R .comment -R .note '$(DIR)'/usr/sbin/* \ | ||||
| 	  '$(DIR)'/usr/bin/* '$(DIR)'/usr/lib/dropbear/* | ||||
| 	# init and run scripts | ||||
| 	install -d -m0755 "$(DIR)"/etc/init.d | ||||
| 	install -m0755 debian/dropbear.init "$(DIR)"/etc/init.d/dropbear | ||||
| 	install -m0755 debian/service/run "$(DIR)"/etc/dropbear/run | ||||
| 	install -d -m0755 "$(DIR)"/etc/dropbear/log | ||||
| 	install -m0755 debian/service/log "$(DIR)"/etc/dropbear/log/run | ||||
| 	ln -s /var/log/dropbear "$(DIR)"/etc/dropbear/log/main | ||||
| 	ln -s /var/run/dropbear "$(DIR)"/etc/dropbear/supervise | ||||
| 	ln -s /var/run/dropbear.log "$(DIR)"/etc/dropbear/log/supervise | ||||
| 	install -d -m0755 '$(DIR)'/etc/init.d | ||||
| 	install -m0755 debian/dropbear.init '$(DIR)'/etc/init.d/dropbear | ||||
| 	install -m0755 debian/service/run '$(DIR)'/etc/dropbear/run | ||||
| 	install -d -m0755 '$(DIR)'/etc/dropbear/log | ||||
| 	install -m0755 debian/service/log '$(DIR)'/etc/dropbear/log/run | ||||
| 	ln -s /var/log/dropbear '$(DIR)'/etc/dropbear/log/main | ||||
| 	ln -s /var/run/dropbear '$(DIR)'/etc/dropbear/supervise | ||||
| 	ln -s /var/run/dropbear.log '$(DIR)'/etc/dropbear/log/supervise | ||||
| 	# man pages | ||||
| 	install -d -m0755 "$(DIR)"/usr/share/man/man8 | ||||
| 	install -d -m0755 '$(DIR)'/usr/share/man/man8 | ||||
| 	for i in dropbear.8 dropbearkey.8; do \ | ||||
| 	  install -m644 $$i "$(DIR)"/usr/share/man/man8/ || exit 1; \ | ||||
| 	  install -m644 $$i '$(DIR)'/usr/share/man/man8/ || exit 1; \ | ||||
| 	done | ||||
| 	gzip -9 "$(DIR)"/usr/share/man/man8/*.8 | ||||
| 	gzip -9 '$(DIR)'/usr/share/man/man8/*.8 | ||||
| 	install -d -m0755 '$(DIR)'/usr/share/man/man1 | ||||
| 	install -m644 debian/dbclient.1 '$(DIR)'/usr/share/man/man1/ | ||||
| 	gzip -9 '$(DIR)'/usr/share/man/man1/*.1 | ||||
| 	# copyright, changelog | ||||
| 	cat debian/copyright.in LICENSE >debian/copyright | ||||
| 	ln -s CHANGES changelog | ||||
| 	test -r changelog || ln -s CHANGES changelog | ||||
| 
 | ||||
| binary-indep: | ||||
| 
 | ||||
| binary-arch: install dropbear.deb | ||||
| 	test "$(CC)" != 'gcc' || \ | ||||
| 	  dpkg-shlibdeps "$(DIR)"/usr/sbin/* "$(DIR)"/usr/bin/* \ | ||||
| 	    "$(DIR)"/usr/lib/dropbear/* | ||||
| 	dpkg-gencontrol -isp -pdropbear -P"$(DIR)" | ||||
| 	dpkg -b "$(DIR)" .. | ||||
| 	test '$(CC)' != 'gcc' || \ | ||||
| 	  dpkg-shlibdeps '$(DIR)'/usr/sbin/* '$(DIR)'/usr/bin/* \ | ||||
| 	    '$(DIR)'/usr/lib/dropbear/* | ||||
| 	dpkg-gencontrol -isp -pdropbear -P'$(DIR)' | ||||
| 	dpkg -b '$(DIR)' .. | ||||
| 
 | ||||
| binary: binary-arch binary-indep | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user