From eb9b27cb1cd8dc64ce72b2fb3ead4b40ceb424c0 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sun, 9 Mar 2014 19:51:12 +0100 Subject: [PATCH] heimdal: Updated (1.3.3 -> 1.5.2) --- .../heimdal-1.3.3-linux3-pthread.patch | 42 ---------------- .../heimdal-1.3.3-no-applications.patch | 50 ------------------- security/heimdal/heimdal.desc | 8 +-- security/heimdal/no-applications.patch | 32 ++++++++++++ 4 files changed, 36 insertions(+), 96 deletions(-) delete mode 100644 security/heimdal/heimdal-1.3.3-linux3-pthread.patch delete mode 100644 security/heimdal/heimdal-1.3.3-no-applications.patch create mode 100644 security/heimdal/no-applications.patch diff --git a/security/heimdal/heimdal-1.3.3-linux3-pthread.patch b/security/heimdal/heimdal-1.3.3-linux3-pthread.patch deleted file mode 100644 index 950b5ad7e..000000000 --- a/security/heimdal/heimdal-1.3.3-linux3-pthread.patch +++ /dev/null @@ -1,42 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../heimdal/heimdal-1.3.3-linux3-pthread.patch -# Copyright (C) 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -From 0b3c720c014d6813aa4f14d4800b7e57f34380de Mon Sep 17 00:00:00 2001 -From: Jelmer Vernooij -Date: Fri, 22 Jul 2011 14:19:34 +0200 -Subject: [PATCH] cf: Also enable pthreads on Linux 3. - -Signed-off-by: Love Hornquist Astrand ---- - cf/pthreads.m4 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/cf/pthreads.m4 b/cf/pthreads.m4 -index 7ce7310..209e4f3 100644 ---- a/cf/pthreads.m4 -+++ b/cf/pthreads.m4 -@@ -41,7 +41,7 @@ case "$host" in - ;; - *-*-linux* | *-*-linux-gnu) - case `uname -r` in -- 2.*) -+ 2.*|3.*) - native_pthread_support=yes - PTHREAD_CFLAGS=-pthread - PTHREAD_LIBADD=-pthread --- -1.6.5.GIT - diff --git a/security/heimdal/heimdal-1.3.3-no-applications.patch b/security/heimdal/heimdal-1.3.3-no-applications.patch deleted file mode 100644 index e9efcc551..000000000 --- a/security/heimdal/heimdal-1.3.3-no-applications.patch +++ /dev/null @@ -1,50 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../heimdal/heimdal-1.3.3-no-applications.patch -# Copyright (C) 2010 - 2012 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Description: Do not build/install all the "kerberized" applications that - are shipped with heimdal - ---- heimdal-1.3.3/Makefile.am.orig 2012-07-23 22:19:34.342211460 +0200 -+++ heimdal-1.3.3/Makefile.am 2012-07-23 22:19:54.364661544 +0200 -@@ -7,7 +7,7 @@ - endif - - SUBDIRS= include lib kuser kdc admin kadmin kpasswd --SUBDIRS+= $(kcm_dir) appl doc tools tests packages etc po -+SUBDIRS+= $(kcm_dir) doc tools tests packages etc po - - ## ACLOCAL = @ACLOCAL@ -I cf - ACLOCAL_AMFLAGS = -I cf ---- heimdal-1.3.3/Makefile.in.orig 2010-09-27 18:10:43.492859163 +0200 -+++ heimdal-1.3.3/Makefile.in 2010-09-27 18:11:01.525871050 +0200 -@@ -113,7 +113,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE - distdir dist dist-all distcheck - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm appl doc \ -+DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm doc \ - tools tests packages etc po - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) -@@ -385,7 +385,7 @@ LIB_kafs = $(top_builddir)/lib/kafs/libk - @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la - @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la - @KCM_TRUE@kcm_dir = kcm --SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) appl \ -+SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) \ - doc tools tests packages etc po - ACLOCAL_AMFLAGS = -I cf - EXTRA_DIST = \ diff --git a/security/heimdal/heimdal.desc b/security/heimdal/heimdal.desc index de52ffe6a..91fc23bac 100644 --- a/security/heimdal/heimdal.desc +++ b/security/heimdal/heimdal.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../heimdal/heimdal.desc -[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2014 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -35,8 +35,8 @@ [L] BSD [S] Stable -[V] 1.3.3 -[P] O ---3-5---9 116.300 +[V] 1.5.2 +[P] O -?-3-5---9 116.300 -[D] 2289359527 heimdal-1.3.3.tar.gz http://www.h5l.org/dist/src/ +[D] 1646049764 heimdal-1.5.2.tar.gz http://www.h5l.org/dist/src/ [D] 2458771974 krb5-kdc.schema http://www.stanford.edu/services/directory/openldap/configuration/ diff --git a/security/heimdal/no-applications.patch b/security/heimdal/no-applications.patch new file mode 100644 index 000000000..e8299a91f --- /dev/null +++ b/security/heimdal/no-applications.patch @@ -0,0 +1,32 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../heimdal/no-applications.patch +# Copyright (C) 2010 - 2014 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Do not build/install all the "kerberized" applications that + are shipped with heimdal + +diff --git a/Makefile.am b/Makefile.am +index 2508096..912c15a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,7 @@ kcm_dir = kcm + endif + + SUBDIRS= include base lib kuser kdc admin kadmin kpasswd +-SUBDIRS+= $(kcm_dir) appl tools tests packages etc po ++SUBDIRS+= $(kcm_dir) tools tests packages etc po + + if HEIMDAL_DOCUMENTATION + SUBDIRS+= doc