tag 622140 + patch On Sun, Apr 10, 2011 at 17:07:59 +0200, Kurt Roeckx wrote:
> SSLv2 support got disabled and the related SSLv2_* method's got > removed. Since you still seem to be using that symbol even > when both the header and the library doesn't provide it anymore, > it's likely this will result in a runtime error instead of a > compile time error. > > You can check that SSLv2 support has been disabled by checking > for the OPENSSL_NO_SSL2 define. But I suggest you just remove > SSLv2 support. > I'll do you one better and suggest you drop openssl support entirely. Nothing in the archive seems to depend on it, everything uses libneon27-gnutls instead. Patch below, I'll consider NMUing in a few days if I don't hear otherwise. diff --git a/debian/changelog b/debian/changelog index 4099d67..ddc0883 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +neon27 (0.29.5-3.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Stop building the openssl variant. No package in Debian uses it anymore. + As a side effect, we don't FTBFS with new openssl (closes: #622140) + * Also drop the old transitional libneon25-dev. + + -- Julien Cristau <jcris...@debian.org> Sat, 02 Jul 2011 13:05:26 +0200 + neon27 (0.29.5-3) unstable; urgency=medium * Don't use \ for line continuation in the parameter of diff --git a/debian/control b/debian/control index b1656f9..78ebc99 100644 --- a/debian/control +++ b/debian/control @@ -2,68 +2,10 @@ Source: neon27 Section: net Priority: optional Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.hu> -Build-Depends: debhelper (>= 5.0.0), pkg-config, libxml2-dev, libssl-dev (>= 0.9.8c), libgnutls-dev (>= 2.8.3), libkrb5-dev, libz-dev, autotools-dev, binutils (>= 2.14.90.0.7), ca-certificates, chrpath +Build-Depends: debhelper (>= 5.0.0), pkg-config, libxml2-dev, libgnutls-dev (>= 2.8.3), libkrb5-dev, libz-dev, autotools-dev, binutils (>= 2.14.90.0.7), ca-certificates, chrpath Homepage: http://www.webdav.org/neon/ Standards-Version: 3.9.1 -Package: libneon27 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: An HTTP and WebDAV client library - neon is an HTTP and WebDAV client library, with a C language API. - . - WARNING: THE NEON API IS NOT YET STABLE. - . - Provides lower-level interfaces to directly implement new HTTP - methods, and higher-level interfaces so that you don't have to - worry about the lower-level stuff. - . - Current features: - * High-level interface to HTTP and WebDAV methods (PUT, GET, HEAD, etc.) - * Low-level interface to HTTP request handling, to allow implementing - new methods easily. - * persistent connections - * RFC2617 basic and digest authentication (including auth-int, md5-sess) - * Proxy support (including basic/digest authentication) - * SSL/TLS support using OpenSSL (including client certificate and thread - safety support) - * Generic WebDAV 207 XML response handling mechanism - * XML parsing using the expat or libxml parsers - * Easy generation of error messages from 207 error responses - * WebDAV resource manipulation: MOVE, COPY, DELETE, MKCOL. - * WebDAV metadata support: set and remove properties, query any set ofi - properties (PROPPATCH/PROPFIND). - * autoconf macros supplied for easily embedding neon directly inside an - application source tree. - -Package: libneon27-dev -Section: libdevel -Architecture: any -Conflicts: libneon-dev, libneon24-doc (<= 0.24.5-1), libneon25-dev (<< 0.28.2-5), libneon27-gnutls-dev -Provides: libneon-dev -Replaces: libneon-dev, libneon25-dev, libneon27-gnutls-dev -Depends: ${misc:Depends}, libneon27 (= ${binary:Version}), libssl-dev, libxml2-dev, libkrb5-dev, pkg-config -Description: Header and static library files for libneon27 - This package contains the headers and the static library for libneon27. - . - Neon provides lower-level interfaces to directly implement new HTTP - methods, and higher-level interfaces so that you don't have to - worry about the lower-level stuff. - -Package: libneon27-dbg -Section: debug -Priority: extra -Architecture: any -Depends: ${misc:Depends}, libneon27 (= ${binary:Version}) -Description: Detached symbols for libneon27 - This package contains the debugging symbols for libneon27, suitable for - debugging. - . - Neon provides lower-level interfaces to directly implement new HTTP - methods, and higher-level interfaces so that you don't have to - worry about the lower-level stuff. - Package: libneon27-gnutls Section: libs Architecture: any @@ -124,13 +66,3 @@ Description: Detached symbols for libneon27 (GnuTLS enabled) Neon provides lower-level interfaces to directly implement new HTTP methods, and higher-level interfaces so that you don't have to worry about the lower-level stuff. - -Package: libneon25-dev -Section: libdevel -Architecture: any -Conflicts: libneon24-doc (<= 0.24.5-1) -Depends: ${misc:Depends}, libneon27-dev (= ${binary:Version}) | libneon27-gnutls-dev (= ${binary:Version}) -Description: Header and static library files for libneon25 - This is a transitional package to neon27. - . - You may safely remove this package. diff --git a/debian/libneon27-dev.files b/debian/libneon27-dev.files deleted file mode 100644 index f17be7b..0000000 --- a/debian/libneon27-dev.files +++ /dev/null @@ -1,6 +0,0 @@ -usr/bin/neon-config -usr/include/neon -usr/lib/libneon.a -usr/lib/libneon.so -usr/lib/pkgconfig -usr/share/man diff --git a/debian/libneon27-dev.lintian b/debian/libneon27-dev.lintian deleted file mode 100644 index eddc413..0000000 --- a/debian/libneon27-dev.lintian +++ /dev/null @@ -1,3 +0,0 @@ -libneon27-dev: manpage-has-errors-from-man usr/share/man/man3/ne_ssl_cert_identity.3.gz 25: warning [p 1, 2.3i]: can't break line -libneon27-dev: manpage-has-errors-from-man usr/share/man/man3/ne_ssl_clicert_read.3.gz 31: warning [p 1, 3.7i]: can't break line -libneon27-dev: manpage-has-errors-from-man usr/share/man/man3/ne_get_error.3.gz 55: warning: `..' not defined diff --git a/debian/rules b/debian/rules index e5262b8..f95fe08 100755 --- a/debian/rules +++ b/debian/rules @@ -18,15 +18,6 @@ CONFIG_COMMON= --enable-shared \ --with-libxml2 CFLAGS="-O2 -g" -${BUILDDIR}/neon-openssl/config.status: configure - cp /usr/share/misc/config.guess \ - /usr/share/misc/config.sub \ - ./ - install -d $(BUILDDIR)/neon-openssl - cd $(BUILDDIR)/neon-openssl/ && \ - CFLAGS=$(CFLAGS) $(CURDIR)/configure ${CONFIG_COMMON} \ - --with-ssl=openssl - ${BUILDDIR}/neon-gnutls/config.status: configure cp /usr/share/misc/config.guess \ /usr/share/misc/config.sub \ @@ -37,14 +28,7 @@ ${BUILDDIR}/neon-gnutls/config.status: configure --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ --with-ssl=gnutls -build: build-openssl build-gnutls -build-openssl: ${BUILDDIR}/neon-openssl/config.status - dh_testdir - cd $(BUILDDIR)/neon-openssl/ && $(MAKE) -# cd $(BUILDDIR)/neon-openssl/ && $(MAKE) check - - touch build-openssl - +build: build-gnutls build-gnutls: ${BUILDDIR}/neon-gnutls/config.status dh_testdir cd $(BUILDDIR)/neon-gnutls/ && \ @@ -61,7 +45,7 @@ build-gnutls: ${BUILDDIR}/neon-gnutls/config.status clean: dh_testdir dh_testroot - -rm -f build-openssl build-gnutls install-openssl install-gnutls \ + -rm -f build-gnutls install-gnutls \ macros/changelog.m4 -rm -f config.sub config.guess rm -rf $(BUILDDIR) @@ -71,29 +55,7 @@ clean: dh_clean -install: install-openssl install-gnutls - -install-openssl: build-openssl - dh_testdir - dh_testroot - dh_installdirs - cd $(BUILDDIR)/neon-openssl/ && $(MAKE) install-lib install-headers install-config install-man DESTDIR=$(DESTDIR)/$(package) - chrpath -d $(CURDIR)/debian/$(package)/usr/lib/libneon.so.27 - rm -f $(CURDIR)/debian/$(package)/usr/lib/libneon.la - dh_movefiles -p$(package)-dev --sourcedir=debian/$(package) - install -d debian/$(package)-dev/usr/share/aclocal - cp macros/neon*.m4 \ - debian/$(package)-dev/usr/share/aclocal/ - - rm -rf debian/$(package)/usr/include \ - debian/$(package)/usr/bin \ - debian/$(package)/usr/share/man \ - debian/$(package)/usr/lib/pkgconfig - - install -d $(DESTDIR)/$(package)-dev/usr/share/lintian/overrides/ - install -m0644 $(CURDIR)/debian/$(package)-dev.lintian $(DESTDIR)/$(package)-dev/usr/share/lintian/overrides/$(package)-dev - - touch install-openssl +install: install-gnutls install-gnutls: build-gnutls dh_testdir @@ -131,15 +93,12 @@ binary-arch: build install dh_testroot -a cp macros/ChangeLog macros/changelog.m4 - dh_installdocs -p$(package)-dev macros/changelog.m4 dh_installdocs -p$(package)-gnutls-dev macros/changelog.m4 dh_installchangelogs -a ChangeLog dh_installdocs -a AUTHORS BUGS NEWS README THANKS TODO - dh_makeshlibs -p$(package) -V'$(package) (>= $(shlibs-version))' dh_makeshlibs -p$(package)-gnutls -V'$(package)-gnutls (>= $(shlibs-version))' dh_link - dh_strip -p$(package) --dbg-package=$(package)-dbg dh_strip -p$(package)-gnutls --dbg-package=$(package)-gnutls-dbg dh_compress -a dh_fixperms -a Cheers, Julien
signature.asc
Description: Digital signature
