[Pkg-openssl-changes] r848 - in openssl/trunk/debian: . patches
Sebastian Andrzej Siewior
bigeasy at moszumanska.debian.org
Sun Oct 23 20:16:25 UTC 2016
Author: bigeasy
Date: 2016-10-23 20:16:25 +0000 (Sun, 23 Oct 2016)
New Revision: 848
Added:
openssl/trunk/debian/libssl-dev.install
openssl/trunk/debian/libssl-doc.install
openssl/trunk/debian/libssl1.0.2.install
openssl/trunk/debian/openssl.install
openssl/trunk/debian/patches/config-hurd.patch
Removed:
openssl/trunk/debian/libssl-dev.files
openssl/trunk/debian/libssl-doc.files
openssl/trunk/debian/libssl1.0.2.files
openssl/trunk/debian/openssl.files
openssl/trunk/debian/patches/config-hurd.patch
Modified:
openssl/trunk/debian/changelog
openssl/trunk/debian/compat
openssl/trunk/debian/control
openssl/trunk/debian/openssl.docs
openssl/trunk/debian/rules
Log:
redo debhelper.
Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/changelog 2016-10-23 20:16:25 UTC (rev 848)
@@ -1,3 +1,15 @@
+openssl (1.0.2j-2) UNRELEASED; urgency=medium
+
+ * redo the rules file to some newer debhelper:
+ - everyfile should remain, nothing should get lost
+ - the scripts in the doc package gained an exec bit
+ - openssl gained a dep on perl (the package contains perl scripts)
+ - libssl1.0.2-dbg is gone, we have dbgsym now
+ - dh compat 10
+ - pkg.install instead of pkg.files is used for install
+
+ -- Sebastian Andrzej Siewior <sebastian at breakpoint.cc> Sun, 23 Oct 2016 22:09:41 +0200
+
openssl (1.0.2j-1) unstable; urgency=medium
* New upstream release
Modified: openssl/trunk/debian/compat
===================================================================
--- openssl/trunk/debian/compat 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/compat 2016-10-23 20:16:25 UTC (rev 848)
@@ -1 +1 @@
-9
+10
Modified: openssl/trunk/debian/control
===================================================================
--- openssl/trunk/debian/control 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/control 2016-10-23 20:16:25 UTC (rev 848)
@@ -1,5 +1,5 @@
Source: openssl
-Build-Depends: debhelper (>= 9), m4, bc, dpkg-dev (>= 1.15.7)
+Build-Depends: debhelper (>= 10), m4, bc, dpkg-dev (>= 1.15.7)
Section: utils
Priority: optional
Maintainer: Debian OpenSSL Team <pkg-openssl-devel at lists.alioth.debian.org>
@@ -94,16 +94,3 @@
Internet.
.
It contains manpages and demo files for libssl and libcrypto.
-
-Package: libssl1.0.2-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Depends: libssl1.0.2 (= ${binary:Version}), ${misc:Depends}
-Description: Secure Sockets Layer toolkit - debug information
- This package is part of the OpenSSL project's implementation of the SSL
- and TLS cryptographic protocols for secure communication over the
- Internet.
- .
- It contains debugging symbols for libssl and libcrypto.
Deleted: openssl/trunk/debian/libssl-dev.files
===================================================================
--- openssl/trunk/debian/libssl-dev.files 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/libssl-dev.files 2016-10-23 20:16:25 UTC (rev 848)
@@ -1,6 +0,0 @@
-usr/lib/*/libssl.so
-usr/lib/*/libcrypto.so
-usr/lib/*/libssl.a
-usr/lib/*/libcrypto.a
-usr/lib/*/pkgconfig
-usr/include
Added: openssl/trunk/debian/libssl-dev.install
===================================================================
--- openssl/trunk/debian/libssl-dev.install (rev 0)
+++ openssl/trunk/debian/libssl-dev.install 2016-10-23 20:16:25 UTC (rev 848)
@@ -0,0 +1,7 @@
+usr/lib/*/libssl.so
+usr/lib/*/libcrypto.so
+usr/lib/*/libssl.a
+usr/lib/*/libcrypto.a
+usr/lib/*/pkgconfig
+usr/include/openssl/*
+usr/include/*/openssl
Deleted: openssl/trunk/debian/libssl-doc.files
===================================================================
--- openssl/trunk/debian/libssl-doc.files 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/libssl-doc.files 2016-10-23 20:16:25 UTC (rev 848)
@@ -1 +0,0 @@
-usr/share/man/man3
Added: openssl/trunk/debian/libssl-doc.install
===================================================================
--- openssl/trunk/debian/libssl-doc.install (rev 0)
+++ openssl/trunk/debian/libssl-doc.install 2016-10-23 20:16:25 UTC (rev 848)
@@ -0,0 +1 @@
+usr/share/man/man3/*
Deleted: openssl/trunk/debian/libssl1.0.2.files
===================================================================
--- openssl/trunk/debian/libssl1.0.2.files 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/libssl1.0.2.files 2016-10-23 20:16:25 UTC (rev 848)
@@ -1,3 +0,0 @@
-usr/lib/*/*.so.*.*.*
-usr/lib/*/*/*.so.*.*.*
-usr/lib/*/openssl-1.0.2/engines
Added: openssl/trunk/debian/libssl1.0.2.install
===================================================================
--- openssl/trunk/debian/libssl1.0.2.install (rev 0)
+++ openssl/trunk/debian/libssl1.0.2.install 2016-10-23 20:16:25 UTC (rev 848)
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*
+usr/lib/*/openssl-1.*/engines
Modified: openssl/trunk/debian/openssl.docs
===================================================================
--- openssl/trunk/debian/openssl.docs 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/openssl.docs 2016-10-23 20:16:25 UTC (rev 848)
@@ -4,3 +4,7 @@
doc/README
doc/standards.txt
FAQ
+CHANGES.SSLeay
+README
+NEWS
+debian/README.optimization
Deleted: openssl/trunk/debian/openssl.files
===================================================================
--- openssl/trunk/debian/openssl.files 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/openssl.files 2016-10-23 20:16:25 UTC (rev 848)
@@ -1,9 +0,0 @@
-usr/share/man/man1
-usr/share/man/man5
-usr/share/man/man7
-usr/bin
-usr/lib/ssl/misc
-usr/lib/ssl/certs
-usr/lib/ssl/openssl.cnf
-usr/lib/ssl/private
-etc/ssl
Added: openssl/trunk/debian/openssl.install
===================================================================
--- openssl/trunk/debian/openssl.install (rev 0)
+++ openssl/trunk/debian/openssl.install 2016-10-23 20:16:25 UTC (rev 848)
@@ -0,0 +1,9 @@
+etc/ssl
+usr/bin/*
+usr/lib/ssl/certs
+usr/lib/ssl/private
+usr/lib/ssl/misc/*
+usr/lib/ssl/openssl.cnf
+usr/share/man/man1/*
+usr/share/man/man5/*
+usr/share/man/man7/*
Deleted: openssl/trunk/debian/patches/config-hurd.patch
===================================================================
--- openssl/trunk/debian/patches/config-hurd.patch 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/patches/config-hurd.patch 2016-10-23 20:16:25 UTC (rev 848)
@@ -1,15 +0,0 @@
-Index: openssl-1.0.0c/config
-===================================================================
---- openssl-1.0.0c.orig/config 2010-12-12 16:09:43.000000000 +0100
-+++ openssl-1.0.0c/config 2010-12-12 16:09:48.000000000 +0100
-@@ -170,8 +170,8 @@
- echo "${MACHINE}-whatever-linux1"; exit 0
- ;;
-
-- GNU*)
-- echo "hurd-x86"; exit 0;
-+ GNU:*|GNU/*:*)
-+ echo "${MACHINE}-gnuish"; exit 0;
- ;;
-
- LynxOS:*)
Added: openssl/trunk/debian/patches/config-hurd.patch
===================================================================
--- openssl/trunk/debian/patches/config-hurd.patch (rev 0)
+++ openssl/trunk/debian/patches/config-hurd.patch 2016-10-23 20:16:25 UTC (rev 848)
@@ -0,0 +1,15 @@
+Index: openssl-1.0.0c/config
+===================================================================
+--- openssl-1.0.0c.orig/config 2010-12-12 16:09:43.000000000 +0100
++++ openssl-1.0.0c/config 2010-12-12 16:09:48.000000000 +0100
+@@ -170,8 +170,8 @@
+ echo "${MACHINE}-whatever-linux1"; exit 0
+ ;;
+
+- GNU*)
+- echo "hurd-x86"; exit 0;
++ GNU:*|GNU/*:*)
++ echo "${MACHINE}-gnuish"; exit 0;
+ ;;
+
+ LynxOS:*)
Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules 2016-09-26 16:21:57 UTC (rev 847)
+++ openssl/trunk/debian/rules 2016-10-23 20:16:25 UTC (rev 848)
@@ -41,11 +41,12 @@
MAKE_TEST = :
endif
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
- dh_testdir
+%:
+ dh $@ --without autoreconf
+
+override_dh_auto_configure:
+
+override_dh_auto_build:
# perl util/ssldir.pl /usr/lib/ssl
# chmod +x debian/libtool
./Configure no-shared $(CONFARGS) debian-$(DEB_HOST_ARCH)
@@ -75,12 +76,11 @@
# make -f Makefile clean
# ./Configure --prefix=/usr --openssldir=/usr/lib/ssl no-idea no-mdc2 no-rc5 debian-$(DEB_HOST_ARCH)
# make -f Makefile all
- touch build-stamp
-clean:
- dh_testdir
- dh_testroot
- -rm -f build-stamp
+# we test as part of the build
+override_dh_auto_test:
+
+override_dh_auto_clean:
-./Configure $(CONFARGS) debian-$(DEB_HOST_ARCH)
[ ! -f Makefile ] || make -f Makefile clean clean-shared
#-make -f Makefile dclean
@@ -101,34 +101,9 @@
rm -f certs/demo/*.0
rm -rf crypto/aes/aes-armv4.S crypto/bn/armv4-gf2m.S crypto/modes/ghash-armv4.S crypto/sha/*.S
find . -type l -exec rm '{}' \;
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean
- dh_installdirs
+
+override_dh_auto_install:
make -f Makefile install INSTALL_PREFIX=`pwd`/debian/tmp
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdirs -i
- dh_installman -plibssl-doc
- dh_installdocs -i
- dh_movefiles -i
- dh_installchangelogs -i CHANGES
- dh_compress -i
- dh_fixperms -i
- dh_gencontrol -i
- dh_installdeb -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdirs -a
# pic static libraries, nobody should need them
# mv debian/tmp/usr/lib/libcrypto.a debian/tmp/usr/lib/libcrypto_pic.a
# mv debian/tmp/usr/lib/libssl.a debian/tmp/usr/lib/libssl_pic.a
@@ -140,38 +115,25 @@
cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcrypto.so.* debian/libcrypto1.0.2-udeb/usr/lib/
cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so.* debian/libssl1.0.2-udeb/usr/lib/
cp -auv lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
- for opt in $(OPTS); do set -xe; mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt; cp -auv $$opt/lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt/; done
+ for opt in $(OPTS); \
+ do set -xe; \
+ mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt; \
+ cp -auv $$opt/lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt/; \
+ done
mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl
mv debian/tmp/usr/include/openssl/opensslconf.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl/
- install debian/copyright debian/libssl1.0.2/usr/share/doc/libssl1.0.2/
- install debian/changelog debian/libssl1.0.2/usr/share/doc/libssl1.0.2/changelog.Debian
- install debian/copyright debian/libssl-dev/usr/share/doc/libssl-dev/
- install debian/changelog debian/libssl-dev/usr/share/doc/libssl-dev/changelog.Debian
- dh_installdocs -a CHANGES.SSLeay README NEWS debian/README.optimization
- dh_installexamples -a
+override_dh_installchangelogs-binary:
dh_installchangelogs -a CHANGES
- dh_installman -popenssl
- dh_installdebconf -a
- dh_movefiles -a
- dh_compress -a
+
+override_dh_fixperms:
chmod 700 debian/openssl/etc/ssl/private
dh_fixperms -a -X etc/ssl/private
- dh_strip -plibssl1.0.2 --dbg-package=libssl1.0.2-dbg
- dh_strip -a -Nlibssl1.0.2
- dh_perl -a -d
- dpkg-gensymbols -Pdebian/libssl1.0.2/ -plibssl1.0.2 -c4
- dh_makeshlibs -a -V "libssl1.0.2" --add-udeb="libcrypto1.0.2-udeb" -Xengines
- sed -i '/^udeb: libssl/s/libcrypto1.0.2-udeb/libssl1.0.2-udeb/' debian/libssl1.0.2/DEBIAN/shlibs
- dh_shlibdeps -a -L libssl1.0.2 -l debian/libssl1.0.2/usr/lib/$(DEB_HOST_MULTIARCH)
- dh_gencontrol -a
- dh_installdeb -a
- dh_md5sums -a
- dh_builddeb -a
- echo -en "\a"
-# Below here is fairly generic really
+override_dh_makeshlibs:
+ #dpkg-gensymbols -Pdebian/libssl1.0.2/ -plibssl1.0.2 -c4
+ dh_makeshlibs -a --add-udeb="libcrypto1.0.2-udeb" -Xengines
-binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean install
+override_dh_shlibdeps:
+ sed -i '/^udeb: libssl/s/libcrypto1.0.2-udeb/libssl1.0.2-udeb/' debian/libssl1.0.2/DEBIAN/shlibs
+ dh_shlibdeps -a -L libssl1.0.2
More information about the Pkg-openssl-changes
mailing list