Hello community, here is the log from the commit of package dropbear for openSUSE:Factory checked in at 2013-10-17 20:36:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dropbear (Old) and /work/SRC/openSUSE:Factory/.dropbear.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dropbear" Changes: -------- --- /work/SRC/openSUSE:Factory/dropbear/dropbear.changes 2013-10-15 10:40:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dropbear.new/dropbear.changes 2013-10-17 20:40:42.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Oct 17 08:35:01 UTC 2013 - [email protected] + +- imported upstream version 2013.60 + * Fix "make install" so that it doesn't always install to /bin and /sbin + * Fix "make install MULTI=1", installing manpages failed + * Fix "make install" when scp is included since it has no manpage + * Make --disable-bundled-libtom work + +------------------------------------------------------------------- Old: ---- dropbear-2013.59.tar.bz2 New: ---- dropbear-2013.60.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dropbear.spec ++++++ --- /var/tmp/diff_new_pack.SSFCRL/_old 2013-10-17 20:40:46.000000000 +0200 +++ /var/tmp/diff_new_pack.SSFCRL/_new 2013-10-17 20:40:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: dropbear -Version: 2013.59 +Version: 2013.60 Release: 0 Summary: A relatively small SSH 2 server and client License: MIT ++++++ SHA1SUM.asc ++++++ --- /var/tmp/diff_new_pack.SSFCRL/_old 2013-10-17 20:40:46.000000000 +0200 +++ /var/tmp/diff_new_pack.SSFCRL/_new 2013-10-17 20:40:46.000000000 +0200 @@ -1,13 +1,108 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -4f2563ddb5eb82868b5ae0648f24a2ac5fc781fc CHANGES +87a1b2d302553eb8b5fb320e1cd3aeba38d56dd2 dropbear-0.23.tar.bz2 +6d4db1612de20d094518bf4a7f90f4ccc501c307 dropbear-0.23.tar.gz +8cc247c584e3836c18a3fe1852ace16deef12cd6 dropbear-0.255.tar.bz2 +ce81bb82649af9a8ae6edb401e36f7363fcc4d70 dropbear-0.255.tar.gz +03b4f4d71c02c03f9cf200fdcfa717f7fb4691bb dropbear-0.28.tar.bz2 +52b8c595c2a5a885292fbc425b20473dc233e06c dropbear-0.28.tar.gz +c57cb938e76bcf6378fb8659c8f3170d18b71965 dropbear-0.29.tar.bz2 +381704f5999d0dfb73449eed16fc119d34035928 dropbear-0.29.tar.gz +e079dc07e1e94984ae97f8ea8261447a9d9dfd5b dropbear-0.30.tar.bz2 +d8a47b803e436409c5d79e52bfbc8a8bd04526ec dropbear-0.30.tar.gz +5ae0c9a1d8d2e7518a0b6f5fc6ec01a41f03b612 dropbear-0.31.tar.bz2 +ee5364af5d08f012169c79f31dd825bdab08b53c dropbear-0.31.tar.gz +6ea4274b6a4c6574e43775333a4588ee9233038e dropbear-0.32.tar.bz2 +5d33fe20b96f5e23a5a9573f9cfb88e00bb42c64 dropbear-0.32.tar.gz +40807147292d0ccce9b4f24848561284885dda5a dropbear_0.33-1_i386.deb +47f7484099aaa24503c61e1f2e88a185d1d8d559 dropbear-0.33.tar.bz2 +477ee40474220be2b7d80ddc11800dc56d567f9d dropbear-0.33.tar.gz +4c7bbe194e1a560491e1b9252f9a0b9a7187bbea dropbear_0.34-1_i386.deb +466c99d8f07a69b1cf7ce245f2ec1cdcc47cc37c dropbear-0.34.tar.bz2 +9b57c595e7c4556921cb3bfb3272109367261c16 dropbear-0.34.tar.gz +71054c81fc5e2001f17ddbb3ca34f34cf19193b4 dropbear_0.35-1_i386.deb +1797732bfe1e07118fcd07743ce57acb1e4ef6e4 dropbear-0.35.tar.bz2 +3017164c713f66e1659883c8c341ad5085e93343 dropbear-0.35.tar.gz +1ead82c2ceb9e2eb8d2cd255923d957f04ef4159 dropbear_0.36-1_i386.deb +89977e99411c5bc67c2de006665afde7bfc3dff2 dropbear-0.36.tar.bz2 +a1d685e36cb2e406101a7d149a8f9e9cd305dc0e dropbear-0.36.tar.gz +d136debba86f405c77374f1eaf726101497a903d dropbear_0.37-1_i386.deb +41c03ff61b46dae591f060f4ca721deba65735fc dropbear-0.37.tar.bz2 +777d2ec4c001284f32887a9872fcfd0cc3e12615 dropbear-0.37.tar.gz +e60cc690b512a7a13133da117375ac886b91eb0b dropbear_0.38-1_i386.deb +e6afb8861155fd26903e6207850baec6f3ad04de dropbear-0.38.tar.bz2 +b3fc115cc35e2916e97d97eff026817886741e03 dropbear-0.38.tar.gz +fbbfa9463efe0014b035ac6f44624d631333b680 dropbear_0.39-1_i386.deb +856490f5c27ed084a42935fd1c97077c5cae1278 dropbear-0.39.tar.bz2 +26241668ad2a8a1b3c86ac879ad7d6f425b7c24d dropbear-0.39.tar.gz +4b0dcc34775ec25b0c5168c2fee6d64cd332bd63 dropbear_0.40-1_i386.deb +368477a822e665fee5fcde010c0ef65c95f91bfb dropbear-0.40pre1.tar.gz +566f1224943a6874949a6d4757921b94e33af4ef dropbear-0.40.tar.bz2 +29865d22cbf876565a18bf3ba8f9ed7e8b23667f dropbear-0.40.tar.gz +c98b9532788bb24f687132d04f23a1a04e61d58c dropbear_0.41-1_i386.deb +d1e15a53439a0bc7ae5955fd2afc9139dbb54c0c dropbear-0.41.tar.bz2 +87e75c5c1ce3cffe5385a3faf18bb90a06a8f450 dropbear-0.41.tar.gz +886c96bb9a8206c353a707ac79867730e29e2dac dropbear_0.42-1_i386.deb +2b4f1e22af1dfaffdfe7fbcf75cb6b79b322efc3 dropbear-0.42.tar.bz2 +af7635283b3c71074214453e4116bc7b0b165fe3 dropbear-0.42.tar.gz +e3bfba27deb12a8dc123d1887b6513ec51359b3c dropbear_0.43-1_i386.deb +0bce83ad1a90b9b91e34d0c777f0d914516fd99d dropbear-0.43.tar.bz2 +87341f88700796d84c7bff96d0d4c8d492c3f20a dropbear-0.43.tar.gz +648d1f91cf4c00821f79fd3465d46c03031323e3 dropbear_0.44+final-1_i386.deb +a95bde40bce8d7809097a1cda87ef139e97649ce dropbear-0.44.tar.bz2 +5e95daae88e92603d44ef9a4d18d8af6df77240e dropbear-0.44.tar.gz +99fdde0a181fd8ebf7efa0b1326c37ed523084e2 dropbear-0.44test1.tar.bz2 +5450c3be308d8f4867e3bf7106ff2fd4dfc43fb4 dropbear-0.44test1.tar.gz +742eb619cfdc595db6c413eeba3626254756f104 dropbear-0.44test2.tar.bz2 +081047ab91283465ebc62d8dcd697ac216a2bfc3 dropbear-0.44test2.tar.gz +b9fd5fdc914bcac68a43d09bd91a481366da72c8 dropbear-0.44test3.tar.bz2 +4b9efae7d7fad10197ba6afae99ffffb3e282371 dropbear-0.44test3.tar.gz +c33f325afaf28b670acc8e4ae9f5ce47ca9977ea dropbear-0.44test4.tar.bz2 +186a3cde36b31c1063c939c8336848bea563950e dropbear-0.44test4.tar.gz +3639b2748243476f742422121e59ab9095dcd8d4 dropbear_0.45-1_i386.deb +6368d839888750726391394177f89f5709d6d816 dropbear-0.45.tar.bz2 +d8b3e829b68233b8fe8fe1cbfb1b14e62f205baf dropbear-0.45.tar.gz +91cf387f1c268962ea75d364d496bed2815f1dc7 dropbear_0.46-0.1_i386.deb +2b6d2083ec0294fde55c75e4080c06637cbcf833 dropbear-0.46.tar.bz2 +14e70182dd6b6f3d1491bd29e2864c2b826b1254 dropbear-0.46.tar.gz +f8a0fa6c19eb4d9ccbdaff9dd9e84b91e05d22fd dropbear_0.47-0.1_i386.deb +7a46a02f489b66cbf4c6383328ba22527a9d3109 dropbear-0.47.tar.bz2 +47f92c7bf5a42bd5ed62c953c3f5062d09efec7f dropbear-0.47.tar.gz +e45c2abc460d8a3d5c62cc904f29cb9c6964d0fc dropbear_0.48-0.1_i386.deb +4dd349b5e3c1aa1b627c52a27f17f5eb7e85c146 dropbear-0.48.1.tar.gz +6b9c3a68a924aaf606d9ef1d8cf7c38eeec249c8 dropbear-0.48.tar.gz +a459073a993770781aa2a15aa944ef6a603193ca dropbear_0.49-0.1_i386.deb +32524c2ba672b95de5adf66d18616bd90842e56e dropbear-0.49.tar.bz2 +97ac3d863ffca386aa25b6f60c71ab086aaef591 dropbear-0.49.tar.gz +7ba7b339af41d5ed74911e857ae13c31cd87ed7f dropbear_0.50-0.1_i386.deb +97f31bbe1d36f156ec895de97ecc1d400da5f0e5 dropbear-0.50.tar.bz2 +6f56bc88bc29a99c58fe85c98a60249b9782ef36 dropbear-0.50.tar.gz +42cf780b8fbf1b252feb2107dda6a1ad6e55f0a7 dropbear_0.51-0.1_i386.deb +cb942783efa6e16b61a3f48da43ed7fb2597014d dropbear-0.51.tar.bz2 +78c07d63d74e7f4fb09283ed9fab4defe9e3c35c dropbear-0.51.tar.gz +fa902daa0ec40e9c4825b0746d426bd3ab410899 dropbear_0.52-0.1_i386.deb +8c1745a9b64ffae79f28e25c6fe9a8b96cac86d8 dropbear-0.52.tar.bz2 +ae927e8b90059a7ba2b2b514d9824c12885b1949 dropbear-0.52.tar.gz +01d9c6673b2b20659b8557cfe6de8386a94f4801 dropbear-0.53.1.tar.bz2 +2faf6ca592b70783029c0ec4d4fc9a390fb12e19 dropbear-0.53.1.tar.gz +ae151667ee81d1ccc6ad2c14f4d00a0ad1500c66 dropbear-0.53.tar.bz2 +e17b611d71d407a8e584aab584322c903ffe2847 dropbear-0.53.tar.gz +ebae34ae1f64324cae83f3440b3b05a93835d5fb dropbear-2011.54.tar.bz2 +09a4d8e4132565f5abf4b1a16efe786af1ad8a63 dropbear-2011.54.tar.gz +261d033c28031faa34b92390ad5278feb20c6efc dropbear-2012.55.tar.bz2 +2c65dd1f423884a38079f5e4386c698015222279 dropbear-2012.55.tar.gz +92a56c17a14f5b41d62605f5225b80bc893162a3 dropbear-2013.56.tar.bz2 +643ccee86007917c9be0a2e00bb40de2aba7c239 dropbear-2013.57.tar.bz2 fdbc0ed332b17fc7579dbce6d95d585cf5d653d7 dropbear-2013.58.tar.bz2 86849db6a4cf9dd99c97329ca6446d91f2143f75 dropbear-2013.59.tar.bz2 +5a322945e97d7433cfd829e3a089f2b6c43cbb80 dropbear-2013.60.tar.bz2 +ca75e08ded7744115c5471df246a3d42431a016e mssh0.1-test1.tar.gz +595c595b961b6867cce7887cc467da3df8049eed oldpage.html -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) -iEYEARECAAYFAlJO0C4ACgkQjPn4sExkf7yohgCgpLGAJe7QeUvBmf7A0qw3sLQp -baAAmwZpxoWzQHgWQTO+xj7oqLLAfKLc -=JdsI +iEYEARECAAYFAlJepbsACgkQjPn4sExkf7y6kQCcDdaO3vU/mQVuFhmekM1YvQIx +MF0AnjA7HUs4+zCmLfwrmDhpbr4QBQAA +=kKWg -----END PGP SIGNATURE----- ++++++ dropbear-2013.59.tar.bz2 -> dropbear-2013.60.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/.hg_archival.txt new/dropbear-2013.60/.hg_archival.txt --- old/dropbear-2013.59/.hg_archival.txt 2013-10-04 16:23:03.000000000 +0200 +++ new/dropbear-2013.60/.hg_archival.txt 2013-10-16 16:34:53.000000000 +0200 @@ -1,5 +1,5 @@ repo: d7da3b1e15401eb234ec866d5eac992fc4cd5878 -node: 7b68e581985fd4ea50869f8608ab95cda5d17876 +node: a50a1dc743317fad9b3737bc68fbca640659bb6d branch: default -latesttag: DROPBEAR_2013.58 -latesttagdistance: 21 +latesttag: DROPBEAR_2013.59 +latesttagdistance: 7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/.hgsigs new/dropbear-2013.60/.hgsigs --- old/dropbear-2013.59/.hgsigs 2013-10-04 16:23:03.000000000 +0200 +++ new/dropbear-2013.60/.hgsigs 2013-10-16 16:34:53.000000000 +0200 @@ -4,3 +4,4 @@ 9b80981212fe6c01b7c16b3ca7c4e66af56f12f1 0 iEYEABECAAYFAlFLKKcACgkQjPn4sExkf7xK7wCfcioCmJPsysSbQO6+4qZMVe0mmLwAn2/o+wRf4MrUXlohrr7aXEF9vdSB 095b46180bbc412b029420587736a6185afc17e1 0 iEYEABECAAYFAlFsCnkACgkQjPn4sExkf7xLrwCfeMWjUaSmfU/fvseT5TdrYRqBEVQAoLz5SFLEA40C5f8zE8Ma/vgVJVIC f168962bab857ca030829e4cd73d9b32c868c874 0 iEYEABECAAYFAlFwDNwACgkQjPn4sExkf7wJ6QCePVovn/avKXUyNwNBYCcov6JLYqkAnRCPQdkXgv20N3t10r6PRMBBo1/S +deb211f75ca194e2fcf0d2e5f71c60474e42ec95 0 iEYEABECAAYFAlJO01cACgkQjPn4sExkf7yDqACaA/P+Yl/K2Cv3OC5G0b7ck2Kb75EAoIeW7qpCyclzJLWwk95koED+4lxD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/.hgtags new/dropbear-2013.60/.hgtags --- old/dropbear-2013.59/.hgtags 2013-10-04 16:23:03.000000000 +0200 +++ new/dropbear-2013.60/.hgtags 2013-10-16 16:34:53.000000000 +0200 @@ -38,3 +38,4 @@ 1b8b2b9d6e94bc3cc5e61b620476ea36cc466e1b DROPBEAR_2013.56 96b8bcb88017815040949a417caa55686271e8a9 DROPBEAR_2013.57 e76614145aea67f66e4a4257685c771efba21aa1 DROPBEAR_2013.58 +7b68e581985fd4ea50869f8608ab95cda5d17876 DROPBEAR_2013.59 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/CHANGES new/dropbear-2013.60/CHANGES --- old/dropbear-2013.59/CHANGES 2013-10-04 16:23:03.000000000 +0200 +++ new/dropbear-2013.60/CHANGES 2013-10-16 16:34:53.000000000 +0200 @@ -1,3 +1,13 @@ +2013.60 - Wednesday 16 October 2013 + +- Fix "make install" so that it doesn't always install to /bin and /sbin + +- Fix "make install MULTI=1", installing manpages failed + +- Fix "make install" when scp is included since it has no manpage + +- Make --disable-bundled-libtom work + 2013.59 - Friday 4 October 2013 - Fix crash from -J command @@ -14,10 +24,10 @@ - Limit the size of decompressed payloads, avoids memory exhaustion denial of service - Thanks to Logan Lamb for reporting and investigating it + Thanks to Logan Lamb for reporting and investigating it. CVE-2013-4421 - Avoid disclosing existence of valid users through inconsistent delays - Thanks to Logan Lamb for reporting + Thanks to Logan Lamb for reporting. CVE-2013-4434 - Update config.guess and config.sub for newer architectures @@ -318,7 +328,7 @@ - Security: dbclient previously would prompt to confirm a mismatching hostkey but wouldn't warn loudly. It will now - exit upon a mismatch. + exit upon a mismatch. CVE-2007-1099 - Compile fixes, make sure that all variable definitions are at the start of a scope. @@ -380,7 +390,7 @@ (thanks to Tomas Vanek for helping track it down) - Implement per-IP pre-authentication connection limits - (after some poking from Pablo Fernandez) + (after some poking from Pablo Fernandez) CVE-2006-1206 - Exit gracefully if trying to connect to as SSH v1 server (reported by Rushi Lala) @@ -401,7 +411,7 @@ - SECURITY: fix for buffer allocation error in server code, could potentially allow authenticated users to gain elevated privileges. All multi-user systems running the server should upgrade (or apply the patch available on the - Dropbear webpage). + Dropbear webpage). CVE-2005-4178 - Fix channel handling code so that redirecting to /dev/null doesn't use 100% CPU. @@ -608,7 +618,7 @@ - SECURITY: Don't try to free() uninitialised variables in DSS verification code. Thanks to Arne Bernin for pointing out this bug. This is possibly exploitable, all users with DSS and pubkey-auth compiled in are advised to - upgrade. + upgrade. CVE-2004-2486 - Clean up agent forwarding socket files correctly, patch from Gerrit Pape. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/MULTI new/dropbear-2013.60/MULTI --- old/dropbear-2013.59/MULTI 2013-10-04 16:23:03.000000000 +0200 +++ new/dropbear-2013.60/MULTI 2013-10-16 16:34:53.000000000 +0200 @@ -20,7 +20,3 @@ then execute as normal: ./dropbear <options here> - -"make install" doesn't currently work for multi-binary configuration, though -in most situations where it is being used, the target and build systems will -differ. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/Makefile.in new/dropbear-2013.60/Makefile.in --- old/dropbear-2013.59/Makefile.in 2013-10-04 16:23:03.000000000 +0200 +++ new/dropbear-2013.60/Makefile.in 2013-10-16 16:34:53.000000000 +0200 @@ -66,6 +66,7 @@ srcdir=@srcdir@ prefix=@prefix@ +exec_prefix=@exec_prefix@ datarootdir = @datarootdir@ bindir=@bindir@ sbindir=@sbindir@ @@ -121,34 +122,34 @@ install: $(addprefix inst_, $(TARGETS)) -installdropbearmulti: insdbmulti $(addprefix insmulti, $(PROGRAMS)) - -insdbmulti: dropbearmulti - $(INSTALL) -d $(DESTDIR)$(bindir) - $(INSTALL) dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir) - insmultidropbear: dropbearmulti $(INSTALL) -d $(DESTDIR)$(sbindir) -rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) + $(INSTALL) -d $(DESTDIR)$(mandir)/man8 + $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8 insmulti%: dropbearmulti $(INSTALL) -d $(DESTDIR)$(bindir) -rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) -ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) + $(INSTALL) -d $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1 # dropbear should go in sbin, so it needs a seperate rule inst_dropbear: dropbear $(INSTALL) -d $(DESTDIR)$(sbindir) $(INSTALL) dropbear$(EXEEXT) $(DESTDIR)$(sbindir) $(INSTALL) -d $(DESTDIR)$(mandir)/man8 - $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8 + $(INSTALL) -m 644 dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8 inst_%: $* $(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) $*$(EXEEXT) $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1 + if test -e $*.1; then $(INSTALL) -m 644 $*.1 $(DESTDIR)$(mandir)/man1/$*.1; fi + +inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) # for some reason the rule further down doesn't like $($@objs) as a prereq. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/configure new/dropbear-2013.60/configure --- old/dropbear-2013.59/configure 2013-10-04 16:23:12.000000000 +0200 +++ new/dropbear-2013.60/configure 2013-10-16 16:34:59.000000000 +0200 @@ -1333,7 +1333,9 @@ --disable-openpty Don't use openpty, use alternative method --disable-syslog Don't include syslog support --disable-shadow Don't use shadow passwords (if available) - --enable-bundled-libtom Use bundled libtomcrypt/libtommath even if a system version exists + --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists. + --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist. + Default is to use system if available, otherwise bundled. --disable-lastlog Disable use of lastlog even if detected no --disable-utmp Disable use of utmp even if detected no --disable-utmpx Disable use of utmpx even if detected no @@ -5817,9 +5819,107 @@ # Check whether --enable-bundled-libtom was given. if test "${enable_bundled_libtom+set}" = set; then : enableval=$enable_bundled_libtom; - BUNDLED_LIBTOM=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: Forcing bundled libtom*" >&5 + if test "x$enableval" = "xyes"; then + BUNDLED_LIBTOM=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: Forcing bundled libtom*" >&5 $as_echo "$as_me: Forcing bundled libtom*" >&6;} + else + BUNDLED_LIBTOM=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for register_cipher in -ltomcrypt" >&5 +$as_echo_n "checking for register_cipher in -ltomcrypt... " >&6; } +if ${ac_cv_lib_tomcrypt_register_cipher+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltomcrypt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char register_cipher (); +int +main () +{ +return register_cipher (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tomcrypt_register_cipher=yes +else + ac_cv_lib_tomcrypt_register_cipher=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tomcrypt_register_cipher" >&5 +$as_echo "$ac_cv_lib_tomcrypt_register_cipher" >&6; } +if test "x$ac_cv_lib_tomcrypt_register_cipher" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBTOMCRYPT 1 +_ACEOF + + LIBS="-ltomcrypt $LIBS" + +else + as_fn_error $? "Missing system libtomcrypt and --disable-bundled-libtom was specified" "$LINENO" 5 +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_exptmod in -ltommath" >&5 +$as_echo_n "checking for mp_exptmod in -ltommath... " >&6; } +if ${ac_cv_lib_tommath_mp_exptmod+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltommath $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mp_exptmod (); +int +main () +{ +return mp_exptmod (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tommath_mp_exptmod=yes +else + ac_cv_lib_tommath_mp_exptmod=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tommath_mp_exptmod" >&5 +$as_echo "$ac_cv_lib_tommath_mp_exptmod" >&6; } +if test "x$ac_cv_lib_tommath_mp_exptmod" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBTOMMATH 1 +_ACEOF + + LIBS="-ltommath $LIBS" + +else + as_fn_error $? "Missing system libtomcrypt and --disable-bundled-libtom was specified" "$LINENO" 5 +fi + + fi else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/configure.ac new/dropbear-2013.60/configure.ac --- old/dropbear-2013.59/configure.ac 2013-10-04 16:23:03.000000000 +0200 +++ new/dropbear-2013.60/configure.ac 2013-10-16 16:34:53.000000000 +0200 @@ -364,10 +364,20 @@ AC_CHECK_FUNCS(logout updwtmp logwtmp) AC_ARG_ENABLE(bundled-libtom, - [ --enable-bundled-libtom Use bundled libtomcrypt/libtommath even if a system version exists], - [ - BUNDLED_LIBTOM=1 - AC_MSG_NOTICE(Forcing bundled libtom*) +[ --enable-bundled-libtom Force using bundled libtomcrypt/libtommath even if a system version exists. + --disable-bundled-libtom Force using system libtomcrypt/libtommath, fail if it does not exist. + Default is to use system if available, otherwise bundled.], + [ + if test "x$enableval" = "xyes"; then + BUNDLED_LIBTOM=1 + AC_MSG_NOTICE(Forcing bundled libtom*) + else + BUNDLED_LIBTOM=0 + AC_CHECK_LIB(tomcrypt, register_cipher, , + [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) + AC_CHECK_LIB(tommath, mp_exptmod, , + [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) + fi ], [ BUNDLED_LIBTOM=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/debian/changelog new/dropbear-2013.60/debian/changelog --- old/dropbear-2013.59/debian/changelog 2013-10-04 16:23:03.000000000 +0200 +++ new/dropbear-2013.60/debian/changelog 2013-10-16 16:34:53.000000000 +0200 @@ -1,3 +1,9 @@ +dropbear (2013.60-0.1) unstable; urgency=low + + * New upstream release. + + -- Matt Johnston <[email protected]> Wed, 16 Oct 2013 22:54:00 +0800 + dropbear (2013.59-0.1) unstable; urgency=low * New upstream release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dropbear-2013.59/sysoptions.h new/dropbear-2013.60/sysoptions.h --- old/dropbear-2013.59/sysoptions.h 2013-10-04 16:23:04.000000000 +0200 +++ new/dropbear-2013.60/sysoptions.h 2013-10-16 16:34:53.000000000 +0200 @@ -4,7 +4,7 @@ *******************************************************************/ #ifndef DROPBEAR_VERSION -#define DROPBEAR_VERSION "2013.59" +#define DROPBEAR_VERSION "2013.60" #endif #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
