Control: tags 1063523 + pending
Control: tags 1060343 + pending
Dear maintainer,
I've prepared an NMU for duo-unix (versioned as 1.11.3-1.2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Chris
diff -Nru duo-unix-1.11.3/debian/changelog duo-unix-1.11.3/debian/changelog
--- duo-unix-1.11.3/debian/changelog 2024-02-28 03:30:53.000000000 +0100
+++ duo-unix-1.11.3/debian/changelog 2024-04-22 02:52:25.000000000 +0200
@@ -1,3 +1,13 @@
+duo-unix (1.11.3-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Install aliased files into /usr (DEP17 M2) (Closes: #1060343)
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS (Closes: #1063523)
+
+ -- Chris Hofstaedtler <z...@debian.org> Mon, 22 Apr 2024 02:52:25 +0200
+
duo-unix (1.11.3-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru duo-unix-1.11.3/debian/libpam-duo.install duo-unix-1.11.3/debian/libpam-duo.install
--- duo-unix-1.11.3/debian/libpam-duo.install 2011-09-02 22:21:02.000000000 +0200
+++ duo-unix-1.11.3/debian/libpam-duo.install 2024-04-22 02:50:44.000000000 +0200
@@ -1,3 +1,3 @@
-lib/*/security/pam_duo.so
+usr/lib/*/security/pam_duo.so
debian/pam-configs/* usr/share/pam-configs/
debian/pam_duo.conf etc/security/
diff -Nru duo-unix-1.11.3/debian/not-installed duo-unix-1.11.3/debian/not-installed
--- duo-unix-1.11.3/debian/not-installed 2020-03-14 18:08:43.000000000 +0100
+++ duo-unix-1.11.3/debian/not-installed 2024-04-22 02:50:44.000000000 +0200
@@ -1,7 +1,7 @@
# We use the debian-specific version from debian/pam_duo.conf instead.
etc/security/pam_duo.conf
# We don't need .la files for linking
-lib/x86_64-linux-gnu/security/pam_duo.la
+usr/lib/x86_64-linux-gnu/security/pam_duo.la
usr/lib/x86_64-linux-gnu/libduo.la
# We do not support static linking.
usr/lib/x86_64-linux-gnu/libduo.a
diff -Nru duo-unix-1.11.3/debian/patches/cross.patch duo-unix-1.11.3/debian/patches/cross.patch
--- duo-unix-1.11.3/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ duo-unix-1.11.3/debian/patches/cross.patch 2024-04-22 02:52:25.000000000 +0200
@@ -0,0 +1,24 @@
+--- duo-unix-1.11.3.orig/autotools/ax_check_x509.m4
++++ duo-unix-1.11.3/autotools/ax_check_x509.m4
+@@ -14,20 +14,16 @@
+
+ AU_ALIAS([CHECK_X509], [AX_CHECK_X509])
+ AC_DEFUN([AX_CHECK_X509],[
+- AC_MSG_CHECKING([whether X509_TEA_set_state runs])
+ save_LIBS="$LIBS"
+ save_LDFLAGS="$LDFLAGS"
+ save_CPPFLAGS="$CPPFLAGS"
+ LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
+ LIBS="$OPENSSL_LIBS $LIBS"
+ CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
+- AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM([void X509_TEA_set_state(int change);], [X509_TEA_set_state(0);])],
++ AC_CHECK_FUNC([X509_TEA_set_state],
+ [
+- AC_MSG_RESULT([yes])
+ $1
+ ], [
+- AC_MSG_RESULT([no])
+ $2
+ ])
+ CPPFLAGS="$save_CPPFLAGS"
diff -Nru duo-unix-1.11.3/debian/patches/series duo-unix-1.11.3/debian/patches/series
--- duo-unix-1.11.3/debian/patches/series 2020-03-14 18:08:43.000000000 +0100
+++ duo-unix-1.11.3/debian/patches/series 2024-04-22 02:52:25.000000000 +0200
@@ -4,3 +4,4 @@
libduo-install.patch
pam_duo-ldflags.patch
lib-strncpy.patch
+cross.patch
diff -Nru duo-unix-1.11.3/debian/rules duo-unix-1.11.3/debian/rules
--- duo-unix-1.11.3/debian/rules 2020-03-14 18:08:43.000000000 +0100
+++ duo-unix-1.11.3/debian/rules 2024-04-22 02:50:44.000000000 +0200
@@ -11,7 +11,7 @@
dh $@
override_dh_auto_configure:
- dh_auto_configure -- --with-pam=/lib/$(DEB_HOST_MULTIARCH)/security \
+ dh_auto_configure -- --with-pam=/usr/lib/$(DEB_HOST_MULTIARCH)/security \
--sysconfdir=/etc/security \
--includedir=\$${prefix}/include/duo
