From 1c30911ff0463c1215e15dd9f7acb886ca35a93d Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 14:30:10 +0000 Subject: Rename security/ patches to reflect the files they modify. --- security/krb5-maint/files/patch-av | 18 ------------ .../files/patch-clients__ksu__Makefile.in | 18 ++++++++++++ security/krb5-maint/files/patch-config::pre.in | 11 -------- security/krb5-maint/files/patch-config::shlib.conf | 33 ---------------------- security/krb5-maint/files/patch-config__pre.in | 11 ++++++++ security/krb5-maint/files/patch-config__shlib.conf | 33 ++++++++++++++++++++++ .../files/patch-lib::gssapi::krb5::import_name.c | 14 --------- .../files/patch-lib__gssapi__krb5__import_name.c | 14 +++++++++ 8 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 security/krb5-maint/files/patch-av create mode 100644 security/krb5-maint/files/patch-clients__ksu__Makefile.in delete mode 100644 security/krb5-maint/files/patch-config::pre.in delete mode 100644 security/krb5-maint/files/patch-config::shlib.conf create mode 100644 security/krb5-maint/files/patch-config__pre.in create mode 100644 security/krb5-maint/files/patch-config__shlib.conf delete mode 100644 security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c create mode 100644 security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c (limited to 'security/krb5-maint/files') diff --git a/security/krb5-maint/files/patch-av b/security/krb5-maint/files/patch-av deleted file mode 100644 index e86eb930d129..000000000000 --- a/security/krb5-maint/files/patch-av +++ /dev/null @@ -1,18 +0,0 @@ ---- clients/ksu/Makefile.in.orig 2014-01-21 14:11:14.000000000 -0800 -+++ clients/ksu/Makefile.in 2014-05-05 20:55:07.343860783 -0700 -@@ -1,6 +1,6 @@ - mydir=clients$(S)ksu - BUILDTOP=$(REL)..$(S).. --DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' -+DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG - DEFS= - - PROG_LIBPATH=-L$(TOPLIBD) -@@ -34,6 +34,6 @@ - - install:: - -for f in ksu; do \ -- $(INSTALL_SETUID) $$f \ -+ $(INSTALL_PROGRAM) $$f \ - $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ - done diff --git a/security/krb5-maint/files/patch-clients__ksu__Makefile.in b/security/krb5-maint/files/patch-clients__ksu__Makefile.in new file mode 100644 index 000000000000..e86eb930d129 --- /dev/null +++ b/security/krb5-maint/files/patch-clients__ksu__Makefile.in @@ -0,0 +1,18 @@ +--- clients/ksu/Makefile.in.orig 2014-01-21 14:11:14.000000000 -0800 ++++ clients/ksu/Makefile.in 2014-05-05 20:55:07.343860783 -0700 +@@ -1,6 +1,6 @@ + mydir=clients$(S)ksu + BUILDTOP=$(REL)..$(S).. +-DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' ++DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"' -DDEBUG + DEFS= + + PROG_LIBPATH=-L$(TOPLIBD) +@@ -34,6 +34,6 @@ + + install:: + -for f in ksu; do \ +- $(INSTALL_SETUID) $$f \ ++ $(INSTALL_PROGRAM) $$f \ + $(DESTDIR)$(CLIENT_BINDIR)/`echo $$f|sed '$(transform)'`; \ + done diff --git a/security/krb5-maint/files/patch-config::pre.in b/security/krb5-maint/files/patch-config::pre.in deleted file mode 100644 index bdd183e98ad4..000000000000 --- a/security/krb5-maint/files/patch-config::pre.in +++ /dev/null @@ -1,11 +0,0 @@ ---- config/pre.in.orig Fri Nov 19 13:47:51 2004 -+++ config/pre.in Thu Jan 27 17:43:12 2005 -@@ -177,7 +177,7 @@ - INSTALL=@INSTALL@ - INSTALL_STRIP= - INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) --INSTALL_SCRIPT=@INSTALL_PROGRAM@ -+INSTALL_SCRIPT=@INSTALL_SCRIPT@ - INSTALL_DATA=@INSTALL_DATA@ - INSTALL_SHLIB=@INSTALL_SHLIB@ - INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root diff --git a/security/krb5-maint/files/patch-config::shlib.conf b/security/krb5-maint/files/patch-config::shlib.conf deleted file mode 100644 index 55f967d8a505..000000000000 --- a/security/krb5-maint/files/patch-config::shlib.conf +++ /dev/null @@ -1,33 +0,0 @@ ---- config/shlib.conf.orig 2012-08-08 15:27:55.000000000 -0700 -+++ config/shlib.conf 2012-11-02 17:49:31.140500618 -0700 -@@ -306,24 +306,18 @@ - ;; - - *-*-freebsd*) -- if test -x /usr/bin/objformat ; then -- objformat=`/usr/bin/objformat` -- else -- objformat="elf" -- fi -- PICFLAGS=-fpic -- if test "x$objformat" = "xelf" ; then -+ case $krb5_cv_host in -+ sparc64-*) PICFLAGS=-fPIC;; -+ *) PICFLAGS=-fpic;; -+ esac -+ - SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared" - RPATH_FLAG='-Wl,-rpath -Wl,' -- else -- RPATH_FLAG=-R -- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' -- fi - PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' - CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' - SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' - SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' diff --git a/security/krb5-maint/files/patch-config__pre.in b/security/krb5-maint/files/patch-config__pre.in new file mode 100644 index 000000000000..bdd183e98ad4 --- /dev/null +++ b/security/krb5-maint/files/patch-config__pre.in @@ -0,0 +1,11 @@ +--- config/pre.in.orig Fri Nov 19 13:47:51 2004 ++++ config/pre.in Thu Jan 27 17:43:12 2005 +@@ -177,7 +177,7 @@ + INSTALL=@INSTALL@ + INSTALL_STRIP= + INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP) +-INSTALL_SCRIPT=@INSTALL_PROGRAM@ ++INSTALL_SCRIPT=@INSTALL_SCRIPT@ + INSTALL_DATA=@INSTALL_DATA@ + INSTALL_SHLIB=@INSTALL_SHLIB@ + INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root diff --git a/security/krb5-maint/files/patch-config__shlib.conf b/security/krb5-maint/files/patch-config__shlib.conf new file mode 100644 index 000000000000..55f967d8a505 --- /dev/null +++ b/security/krb5-maint/files/patch-config__shlib.conf @@ -0,0 +1,33 @@ +--- config/shlib.conf.orig 2012-08-08 15:27:55.000000000 -0700 ++++ config/shlib.conf 2012-11-02 17:49:31.140500618 -0700 +@@ -306,24 +306,18 @@ + ;; + + *-*-freebsd*) +- if test -x /usr/bin/objformat ; then +- objformat=`/usr/bin/objformat` +- else +- objformat="elf" +- fi +- PICFLAGS=-fpic +- if test "x$objformat" = "xelf" ; then ++ case $krb5_cv_host in ++ sparc64-*) PICFLAGS=-fPIC;; ++ *) PICFLAGS=-fpic;; ++ esac ++ + SHLIBVEXT='.so.$(LIBMAJOR)' ++ LDCOMBINE="libtool --mode=link cc -Xcompiler -shared" + RPATH_FLAG='-Wl,-rpath -Wl,' +- else +- RPATH_FLAG=-R +- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' +- fi + PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' + CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' + SHLIBEXT=.so +- LDCOMBINE='ld -Bshareable' + SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' + SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' diff --git a/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c b/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c deleted file mode 100644 index 40f116af2196..000000000000 --- a/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005 -+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005 -@@ -33,6 +33,11 @@ - #endif - #endif - -+#include -+#if __FreeBSD_version < 500100 -+#include -+#endif -+ - #ifdef HAVE_STRING_H - #include - #else diff --git a/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c b/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c new file mode 100644 index 000000000000..40f116af2196 --- /dev/null +++ b/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c @@ -0,0 +1,14 @@ +--- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005 ++++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005 +@@ -33,6 +33,11 @@ + #endif + #endif + ++#include ++#if __FreeBSD_version < 500100 ++#include ++#endif ++ + #ifdef HAVE_STRING_H + #include + #else -- cgit v1.2.3