From 4f60b6a9cb8fa5b20ada4b8eafd7a9730ca4cd67 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 31 May 2011 14:27:49 +0000 Subject: [PATCH] Fix some comments in the autoconf macros and patch headers, no pkg change. --- .../screensaver/patches/patch-config_h_in | 9 ++++++--- .../screensaver/patches/patch-configure_ac | 20 +++++++++++-------- .../screensaver/patches/patch-src_Makefile_am | 5 ++++- .../patches/patch-src_gs-auth-pam_c | 5 ++++- .../screensaver/patches/patch-src_setuid_c | 5 ++++- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/x11/gnome3/x11/gnome/screensaver/patches/patch-config_h_in b/x11/gnome3/x11/gnome/screensaver/patches/patch-config_h_in index 0e1b3583f62..ed8ce780be7 100644 --- a/x11/gnome3/x11/gnome/screensaver/patches/patch-config_h_in +++ b/x11/gnome3/x11/gnome/screensaver/patches/patch-config_h_in @@ -1,11 +1,14 @@ -$OpenBSD: patch-config_h_in,v 1.1.1.1 2011/05/31 13:00:33 ajacoutot Exp $ +$OpenBSD: patch-config_h_in,v 1.2 2011/05/31 14:27:49 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=651554 + --- config.h.in.orig Mon Apr 4 16:29:28 2011 -+++ config.h.in Tue May 31 12:02:09 2011 ++++ config.h.in Tue May 31 16:06:27 2011 @@ -9,6 +9,9 @@ /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET -+/* Define if you have bsd_auth(3) authentication */ ++/* Define to 1 if using bsd_auth(3) authentication */ +#undef HAVE_BSDAUTH + /* Define to 1 if you have the `clearenv' function. */ diff --git a/x11/gnome3/x11/gnome/screensaver/patches/patch-configure_ac b/x11/gnome3/x11/gnome/screensaver/patches/patch-configure_ac index 930fd65a8c2..86983dd2762 100644 --- a/x11/gnome3/x11/gnome/screensaver/patches/patch-configure_ac +++ b/x11/gnome3/x11/gnome/screensaver/patches/patch-configure_ac @@ -1,6 +1,9 @@ -$OpenBSD: patch-configure_ac,v 1.1.1.1 2011/05/31 13:00:33 ajacoutot Exp $ +$OpenBSD: patch-configure_ac,v 1.2 2011/05/31 14:27:49 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=651554 + --- configure.ac.orig Mon Apr 4 16:27:55 2011 -+++ configure.ac Tue May 31 12:30:59 2011 ++++ configure.ac Tue May 31 16:10:13 2011 @@ -459,6 +459,38 @@ if test "$ac_macosx" = yes; then fi @@ -32,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2011/05/31 13:00:33 ajacoutot Exp $ + [have_bsdauth=yes], + [have_bsdauth=no])]) + if test "$have_bsdauth" = yes; then -+ AC_DEFINE(HAVE_BSDAUTH, 1, [Define if you have bsd_auth(3) authentication]) ++ AC_DEFINE(HAVE_BSDAUTH, 1, [Define to 1 if using bsd_auth(3) authentication]) + fi +fi + @@ -51,15 +54,16 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2011/05/31 13:00:33 ajacoutot Exp $ fi AC_SUBST(HAVE_PAM) AC_SUBST(AUTH_LIBS) -@@ -717,7 +751,9 @@ echo " +@@ -717,7 +751,12 @@ echo " Screen locking enabled: ${enable_locking} Show keyboard indicator: ${with_kbd_layout_indicator} -- PAM prefix: ${PAM_PREFIX} -- - " ++" + +if test "x$have_bsdauth" = "xno" ; then -+ PAM prefix: ${PAM_PREFIX} ++echo "\ + PAM prefix: ${PAM_PREFIX} + + " +fi diff --git a/x11/gnome3/x11/gnome/screensaver/patches/patch-src_Makefile_am b/x11/gnome3/x11/gnome/screensaver/patches/patch-src_Makefile_am index 939593a3494..d664fd882d1 100644 --- a/x11/gnome3/x11/gnome/screensaver/patches/patch-src_Makefile_am +++ b/x11/gnome3/x11/gnome/screensaver/patches/patch-src_Makefile_am @@ -1,4 +1,7 @@ -$OpenBSD: patch-src_Makefile_am,v 1.1.1.1 2011/05/31 13:00:33 ajacoutot Exp $ +$OpenBSD: patch-src_Makefile_am,v 1.2 2011/05/31 14:27:49 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=651554 + --- src/Makefile.am.orig Tue Mar 8 15:33:01 2011 +++ src/Makefile.am Tue May 31 12:28:14 2011 @@ -80,6 +80,7 @@ test_passwd_SOURCES = \ diff --git a/x11/gnome3/x11/gnome/screensaver/patches/patch-src_gs-auth-pam_c b/x11/gnome3/x11/gnome/screensaver/patches/patch-src_gs-auth-pam_c index 0dca32bb871..7d5fe0d7eb0 100644 --- a/x11/gnome3/x11/gnome/screensaver/patches/patch-src_gs-auth-pam_c +++ b/x11/gnome3/x11/gnome/screensaver/patches/patch-src_gs-auth-pam_c @@ -1,4 +1,7 @@ -$OpenBSD: patch-src_gs-auth-pam_c,v 1.1.1.1 2011/05/31 13:00:33 ajacoutot Exp $ +$OpenBSD: patch-src_gs-auth-pam_c,v 1.2 2011/05/31 14:27:49 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=651554 + --- src/gs-auth-pam.c.orig Fri Oct 1 14:32:08 2010 +++ src/gs-auth-pam.c Tue May 31 11:45:10 2011 @@ -24,6 +24,8 @@ diff --git a/x11/gnome3/x11/gnome/screensaver/patches/patch-src_setuid_c b/x11/gnome3/x11/gnome/screensaver/patches/patch-src_setuid_c index 94193f4da01..9936637788f 100644 --- a/x11/gnome3/x11/gnome/screensaver/patches/patch-src_setuid_c +++ b/x11/gnome3/x11/gnome/screensaver/patches/patch-src_setuid_c @@ -1,4 +1,7 @@ -$OpenBSD: patch-src_setuid_c,v 1.1.1.1 2011/05/31 13:00:33 ajacoutot Exp $ +$OpenBSD: patch-src_setuid_c,v 1.2 2011/05/31 14:27:49 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=651554 + --- src/setuid.c.orig Wed Apr 30 04:30:08 2008 +++ src/setuid.c Fri May 15 12:15:54 2009 @@ -194,6 +194,21 @@ hack_uid (char **nolock_reason,