diff options
| -rw-r--r-- | changelog | 4 | ||||
| -rw-r--r-- | patches-applied/010_pam_cplusplus | 51 |
2 files changed, 3 insertions, 52 deletions
@@ -7,8 +7,10 @@ pam (0.79-4) UNRELEASED; urgency=low timestamp for an 8-year-old upload, and this is the most effective way to clear a glut of lintian warnings. * Fix the formatting of the libpam-cracklib package description. + * Patch 010: remove parts of the patch that aren't necessary for C++ + compatibility. - -- Steve Langasek <vorlon@debian.org> Sun, 2 Oct 2005 02:29:44 -0700 + -- Steve Langasek <vorlon@debian.org> Mon, 3 Oct 2005 01:57:54 -0700 pam (0.79-3) unstable; urgency=low diff --git a/patches-applied/010_pam_cplusplus b/patches-applied/010_pam_cplusplus index 135954e8..0db90132 100644 --- a/patches-applied/010_pam_cplusplus +++ b/patches-applied/010_pam_cplusplus @@ -14,29 +14,6 @@ diff -u -r1.3 debian.defs ifneq (,$(findstring $(DEB_BUILD_OPTIONS),debug DEBUG Debug)) CFLAGS += -g endif -Index: Linux-PAM/libpam/include/security/pam_appl.h -=================================================================== -RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpam/include/security/pam_appl.h,v -retrieving revision 1.3 -diff -u -r1.3 pam_appl.h ---- Linux-PAM/libpam/include/security/pam_appl.h 15 Sep 2002 20:17:59 -0000 1.3 -+++ Linux-PAM/libpam/include/security/pam_appl.h 15 Sep 2002 21:22:45 -0000 -@@ -47,12 +47,12 @@ - - extern int pam_chauthtok(pam_handle_t *pamh, int flags); - -+/* take care of any compatibility issues */ -+#include <security/_pam_compat.h> -+ - #ifdef __cplusplus - } - #endif -- --/* take care of any compatibility issues */ --#include <security/_pam_compat.h> - - /* - * Copyright Theodore Ts'o, 1996. All rights reserved. Index: Linux-PAM/libpam/include/security/pam_malloc.h =================================================================== RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpam/include/security/pam_malloc.h,v @@ -94,31 +71,3 @@ diff -u -r1.3 pam_modules.h /* Copyright (C) Theodore Ts'o, 1996. * Copyright (C) Andrew Morgan, 1996-8. -Index: Linux-PAM/libpamc/include/security/pam_client.h -=================================================================== -RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/libpamc/include/security/pam_client.h,v -retrieving revision 1.3 -diff -u -r1.3 pam_client.h ---- Linux-PAM/libpamc/include/security/pam_client.h 15 Sep 2002 20:17:59 -0000 1.3 -+++ Linux-PAM/libpamc/include/security/pam_client.h 15 Sep 2002 21:22:45 -0000 -@@ -17,6 +17,10 @@ - #include <string.h> - #include <stdio.h> - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - /* opaque agent handling structure */ - - typedef struct pamc_handle_s *pamc_handle_t; -@@ -161,6 +165,9 @@ - memcpy((data), (offset) + PAM_BP_RDATA(__prompt), (length)); \ - } while (0) - -+#ifdef __cplusplus -+} -+#endif - - /* Control types */ - |