Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package shishi unblock shishi/1.0.2-6.2 Fixes FTBFS. Greetings from Gothenburg BSP. diff -Nru shishi-1.0.2/debian/changelog shishi-1.0.2/debian/changelog --- shishi-1.0.2/debian/changelog 2018-01-19 15:47:40.000000000 +0100 +++ shishi-1.0.2/debian/changelog 2019-04-07 13:26:04.000000000 +0200 @@ -1,3 +1,10 @@ +shishi (1.0.2-6.2) unstable; urgency=medium + + * Non-maintainer upload with greeting from Gothenburg BSP. + * Add debian/patches/portability-changes.diff (Closes: #924123) + + -- Andreas Henriksson <andr...@fatal.se> Sun, 07 Apr 2019 13:26:04 +0200 + shishi (1.0.2-6.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru shishi-1.0.2/debian/patches/portability-changes.diff shishi-1.0.2/debian/patches/portability-changes.diff --- shishi-1.0.2/debian/patches/portability-changes.diff 1970-01-01 01:00:00.000000000 +0100 +++ shishi-1.0.2/debian/patches/portability-changes.diff 2019-04-07 13:26:04.000000000 +0200 @@ -0,0 +1,67 @@ +From: Andreas Henriksson <andr...@fatal.se> +Subject: pam_shishi: Portability changes. + +This is the upstream commit +http://git.savannah.gnu.org/gitweb/?p=shishi.git;a=commitdiff;h=07cd137bf79af3b9abfe08ff55c36a0c6785e733 +excluding white-space only changes (git diff -w), to make it minimal and +easier for debian-release team to review. + +Addresses: https://bugs.debian.org/924123 + +Index: shishi-1.0.2/extra/pam_shishi/pam_shishi.c +=================================================================== +--- shishi-1.0.2.orig/extra/pam_shishi/pam_shishi.c ++++ shishi-1.0.2/extra/pam_shishi/pam_shishi.c +@@ -33,11 +33,6 @@ + + #include <shishi.h> + +-/* Libtool defines PIC for shared objects */ +-#ifndef PIC +-#define PAM_STATIC +-#endif +- + /* These #defines must be present according to PAM documentation. */ + #define PAM_SM_AUTH + #define PAM_SM_ACCOUNT +@@ -58,13 +53,13 @@ + #define D(x) /* nothing */ + #endif + ++/* Rely on <security/pam_modules.h> ++ * for settings in general, as PAM_EXTERN ++ * is not universal among PAM implementations. ++ */ + #ifndef PAM_EXTERN +-#ifdef PAM_STATIC +-#define PAM_EXTERN static +-#else +-#define PAM_EXTERN extern +-#endif +-#endif ++# define PAM_EXTERN ++#endif /* !PAM_EXTERN */ + + PAM_EXTERN int + pam_sm_authenticate (pam_handle_t * pamh, +@@ -287,6 +282,7 @@ pam_sm_chauthtok (pam_handle_t * pamh, i + return retval; + } + ++/* Linux-PAM. */ + #ifdef PAM_STATIC + + struct pam_module _pam_shishi_modstruct = { +@@ -299,4 +295,11 @@ struct pam_module _pam_shishi_modstruct + pam_sm_chauthtok + }; + +-#endif ++#endif /* PAM_STATIC */ ++ ++/* OpenPAM */ ++#ifdef PAM_MODULE_ENTRY ++ ++PAM_MODULE_ENTRY("pam_shishi"); ++ ++#endif /* PAM_MODULE_ENTRY */ diff -Nru shishi-1.0.2/debian/patches/series shishi-1.0.2/debian/patches/series --- shishi-1.0.2/debian/patches/series 2018-01-19 15:47:40.000000000 +0100 +++ shishi-1.0.2/debian/patches/series 2019-04-07 13:25:26.000000000 +0200 @@ -1,3 +1,4 @@ 64bigendian-ftbfs.diff fix_gcrypt_detection.diff gtkdocize.diff +portability-changes.diff
