[arch-commits] CVS update of arch/build/lib/heimdal (2 files)

[Tobias Powalowski]

    Date: Saturday, June 2, 2007 @ 09:26:56
  Author: tpowa
    Path: /home/cvs-arch/arch/build/lib/heimdal

Modified: 010_all_heimdal-system-libss.patch (1.1 -> 1.2)
          PKGBUILD (1.14 -> 1.15)

'upgpkg: update to new version'


------------------------------------+
 010_all_heimdal-system-libss.patch |   13 +++++++-----
 PKGBUILD                           |   37 +++++++++++++----------------------
 2 files changed, 22 insertions(+), 28 deletions(-)


Index: arch/build/lib/heimdal/010_all_heimdal-system-libss.patch
diff -u arch/build/lib/heimdal/010_all_heimdal-system-libss.patch:1.1 arch/build/lib/heimdal/010_all_heimdal-system-libss.patch:1.2
--- arch/build/lib/heimdal/010_all_heimdal-system-libss.patch:1.1	Wed Aug 24 13:38:56 2005
+++ arch/build/lib/heimdal/010_all_heimdal-system-libss.patch	Sat Jun  2 09:26:56 2007
@@ -1,13 +1,13 @@
---- lib/sl/Makefile.am	2005-06-16 18:28:47.000000000 +0200
-+++ lib/sl/Makefile.am	2005-06-28 01:33:25.000000000 +0200
-@@ -12,33 +12,21 @@
+--- lib/sl/Makefile.am~	2007-06-01 09:48:09.000000000 +0200
++++ lib/sl/Makefile.am	2007-06-01 09:49:30.000000000 +0200
+@@ -12,36 +12,24 @@
  
  include_HEADERS = sl.h
  
 -lib_LTLIBRARIES = libsl.la libss.la
 +lib_LTLIBRARIES = libsl.la
- libsl_la_LDFLAGS = -version-info 1:2:1
--libss_la_LDFLAGS = -version-info 1:4:1
+ libsl_la_LDFLAGS = -version-info 2:0:2
+-libss_la_LDFLAGS = -version-info 1:5:1
  
  libsl_la_LIBADD = @LIB_readline@
 -libss_la_LIBADD = @LIB_readline@ @LIB_com_err@
@@ -15,6 +15,9 @@
  libsl_la_SOURCES = sl_locl.h sl.c $(ES)
 -libss_la_SOURCES = $(libsl_la_SOURCES) ss.c ss.h
  
+ TESTS = test_sl
+ check_PROGRAMS = $(TESTS)	
+ 
  # install these?
  
 -bin_PROGRAMS = mk_cmds
Index: arch/build/lib/heimdal/PKGBUILD
diff -u arch/build/lib/heimdal/PKGBUILD:1.14 arch/build/lib/heimdal/PKGBUILD:1.15
--- arch/build/lib/heimdal/PKGBUILD:1.14	Tue Mar 20 18:25:57 2007
+++ arch/build/lib/heimdal/PKGBUILD	Sat Jun  2 09:26:56 2007
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD,v 1.14 2007/03/20 22:25:57 tpowa Exp $
+# $Id: PKGBUILD,v 1.15 2007/06/02 13:26:56 tpowa Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=heimdal
-pkgver=0.7.2
-pkgrel=6
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="Heimdal Kerberos V5 libraries"
 arch=(i686 x86_64)
 url="http://www.pdc.kth.se/heimdal/"
 depends=('db>=4.5' 'openssl' 'e2fsprogs')
+options=('!nolibtool')
 backup=(etc/krb5.conf)
 source=(ftp://ftp.pdc.kth.se/pub/heimdal/src/heimdal-$pkgver.tar.gz \
 	002_all_heimdal-no_libedit.patch \
@@ -18,11 +19,16 @@
 	heimdal-kdc.rc \
 	kadmind.rc \
 	kpasswd.rc)
-md5sums=(c937580d6f8b11bf7f0e540530e1dc18 1199c4a4a38e9c2b2c0a99bd5781767a
-         3d0262aa218e1611500de735d3581e28 0fe81cb1e33b2a2e60edaf47dfdfe4de
-         30372b1581e4d49a76688e450fd42443 6a73f1dbd50d516e71cac138ac6cfcbd
-         e59650992b9541a30dfce727a194f6e0 1f2f86a67bbfddb7af581d35fdca9627
-         f8f1eca95b9d3f2b4ebf2417b71b81cf)
+### Attention: build it 2 times it links against itself!
+md5sums=('7ff8c4850bce9702d9d3cf9eff05abaa'
+         '1199c4a4a38e9c2b2c0a99bd5781767a'
+         '3d0262aa218e1611500de735d3581e28'
+         '0fe81cb1e33b2a2e60edaf47dfdfe4de'
+         '30372b1581e4d49a76688e450fd42443'
+         'c5f89a0ecd1ff9db95de83cb2779d07f'
+         'e59650992b9541a30dfce727a194f6e0'
+         '1f2f86a67bbfddb7af581d35fdca9627'
+         'f8f1eca95b9d3f2b4ebf2417b71b81cf')
 
 build() {
   cd ${startdir}/src/heimdal-${pkgver}
@@ -49,7 +55,6 @@
 	--with-openssl=/usr \
 	--with-readline-lib=/usr/lib \
 	--with-readline-include=/usr/include/readline \
-	--includedir=/usr/include/heimdal \
 	--libexecdir=/usr/sbin --with-berkeley-db \
 	--disable-krb4
 	
@@ -67,18 +72,6 @@
     fi
     mv ${startdir}/pkg/usr/bin/${i} ${startdir}/pkg/usr/bin/k${i}
   done
-  
-  cd ${startdir}/pkg/usr/include
-  ln -s heimdal gssapi && \
-  ln -s heimdal/krb5-types.h krb5-types.h && \
-  ln -s heimdal/krb5.h krb5.h && \
-  ln -s heimdal/asn1_err.h asn1_err.h && \
-  ln -s heimdal/krb5_asn1.h krb5_asn1.h && \
-  ln -s heimdal/krb5_err.h krb5_err.h && \
-  ln -s heimdal/heim_err.h heim_err.h && \
-  ln -s heimdal/k524_err.h k524_err.h && \
-  ln -s heimdal/krb5-protos.h krb5-protos.h || return 1
-
   rm -rf ${startdir}/pkg/usr/man/cat{1,3,5,8}
   
   #Arch could be a KDC too
@@ -98,6 +91,4 @@
   rm ${startdir}/pkg/usr/share/man/man1/ftp.1*
   rm ${startdir}/pkg/usr/share/man/man1/rsh.1*
   rm ${startdir}/pkg/usr/share/man/man8/rshd.8*
-
-  find ${startdir}/pkg -name '*.la' -exec rm {} \;
 }