[arch-commits] Commit in heimdal/trunk (PKGBUILD heimdal.install)

2010-12-03 Thread Allan McRae
Date: Friday, December 3, 2010 @ 04:59:28
  Author: allan
Revision: 101969

upgpkg: heimdal 1.3.3-4
fix install file texinfo dependency (FS#21762)

Modified:
  heimdal/trunk/PKGBUILD
  heimdal/trunk/heimdal.install

-+
 PKGBUILD|6 +-
 heimdal.install |6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-03 09:43:14 UTC (rev 101968)
+++ PKGBUILD2010-12-03 09:59:28 UTC (rev 101969)
@@ -8,7 +8,7 @@
 
 pkgname=heimdal
 pkgver=1.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc=Implementation of Kerberos V5 libraries
 arch=('i686' 'x86_64')
 url=http://www.h5l.org/;
@@ -74,6 +74,10 @@
--libexecdir=/usr/sbin

   make
+}
+
+package() {
+  cd ${srcdir}/heimdal-${pkgver}
   make DESTDIR=${pkgdir} install
 
   # Rename daemons and their manpages

Modified: heimdal.install
===
--- heimdal.install 2010-12-03 09:43:14 UTC (rev 101968)
+++ heimdal.install 2010-12-03 09:59:28 UTC (rev 101969)
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(heimdal hx509)
 
 post_install() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${fileli...@]}; do
 install-info $infodir/$file.info.gz $infodir/dir 2 /dev/null
   done
@@ -12,9 +13,8 @@
 }
 
 pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${fileli...@]}; do
 install-info --delete $infodir/$file.info.gz $infodir/dir 2 /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et:



[arch-commits] Commit in heimdal/trunk (PKGBUILD)

2010-11-10 Thread Allan McRae
Date: Wednesday, November 10, 2010 @ 23:19:05
  Author: allan
Revision: 98550

upgpkg: heimdal 1.3.3-3
add ldap support

Modified:
  heimdal/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-11 04:00:14 UTC (rev 98549)
+++ PKGBUILD2010-11-11 04:19:05 UTC (rev 98550)
@@ -8,12 +8,12 @@
 
 pkgname=heimdal
 pkgver=1.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc=Implementation of Kerberos V5 libraries
 arch=('i686' 'x86_64')
 url=http://www.h5l.org/;
 license=('custom')
-depends=('db' 'openssl' 'sqlite3' 'e2fsprogs')
+depends=('db' 'openssl' 'sqlite3' 'e2fsprogs' 'libldap')
 backup=(etc/krb5.conf)
 options=('!libtool' '!emptydirs')
 install=heimdal.install
@@ -70,6 +70,7 @@
--with-readline-include=/usr/include/readline \
--with-sqlite3-lib=/usr/lib \
--with-sqlite3-include=/usr/include \
+   --with-openldap=/usr \
--libexecdir=/usr/sbin

   make



[arch-commits] Commit in heimdal/trunk (PKGBUILD)

2010-10-19 Thread Allan McRae
Date: Tuesday, October 19, 2010 @ 07:20:04
  Author: allan
Revision: 96210

upgpkg: heimdal 1.3.3-2
db-5.1 rebuild

Modified:
  heimdal/trunk/PKGBUILD

--+
 PKGBUILD |   44 +++-
 1 file changed, 23 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-19 09:51:15 UTC (rev 96209)
+++ PKGBUILD2010-10-19 11:20:04 UTC (rev 96210)
@@ -8,7 +8,7 @@
 
 pkgname=heimdal
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc=Implementation of Kerberos V5 libraries
 arch=('i686' 'x86_64')
 url=http://www.h5l.org/;
@@ -42,22 +42,24 @@
 
 build() {
   cd ${srcdir}/heimdal-${pkgver}
-  patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch || return 1
-  patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch || return 1
-  patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch || return 1
-  patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch || return 1
-  patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch || return 1
-  patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch || return 1
-  patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch || return 1
+  patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch
+  patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch
+  patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch
+  patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch
+  patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch
+  patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch
+  patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch
 
   sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
+   
+  sed -i 's|$(LIB_NDBM)|$(LIB_NDBM) $(LIB_db_create)|' lib/otp/Makefile.am
 
-  libtoolize --force || return 1
-  aclocal -I cf || return 1
-  autoconf || return 1
-  automake || return 1
+  libtoolize --force
+  aclocal -I cf
+  autoconf
+  automake
 
   ./configure --prefix=/usr --enable-shared=yes --without-x \
--sysconfdir=/etc --mandir=/usr/share/man \
@@ -70,29 +72,29 @@
--with-sqlite3-include=/usr/include \
--libexecdir=/usr/sbin

-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+  make DESTDIR=${pkgdir} install
 
   # Rename daemons and their manpages
   for i in telnetd ftpd rshd; do
-mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8 || return 1
-mv ${pkgdir}/usr/sbin/{,k}${i} || return 1
+mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8
+mv ${pkgdir}/usr/sbin/{,k}${i}
   done
   
   # Rename clients and their manpages
   for i in rcp rsh telnet ftp su login; do
 if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then
-  mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1 || return 1
+  mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1
 fi
-mv ${pkgdir}/usr/bin/{,k}${i} || return 1
+mv ${pkgdir}/usr/bin/{,k}${i}
   done
   rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
   
   # Arch could be a KDC too
   install -d ${pkgdir}/etc/rc.d
-  install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/ || return 
1
+  install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/
   for i in heimdal-kdc kadmind kpasswd; do
-install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i} || return 1
+install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i}
   done
 
   # Remove conflicts
@@ -102,5 +104,5 @@
 
   # Install the license
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
-   ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+   ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }



[arch-commits] Commit in heimdal/trunk (PKGBUILD)

2010-05-27 Thread Allan McRae
Date: Thursday, May 27, 2010 @ 11:14:39
  Author: allan
Revision: 81228

upgpkg: heimdal 1.3.3-1
upstream update

Modified:
  heimdal/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-27 14:02:18 UTC (rev 81227)
+++ PKGBUILD2010-05-27 15:14:39 UTC (rev 81228)
@@ -7,13 +7,13 @@
 #
 
 pkgname=heimdal
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 pkgdesc=Implementation of Kerberos V5 libraries
 arch=('i686' 'x86_64')
 url=http://www.h5l.org/;
 license=('custom')
-depends=('db=4.8' 'openssl' 'sqlite3' 'e2fsprogs')
+depends=('db' 'openssl' 'sqlite3' 'e2fsprogs')
 backup=(etc/krb5.conf)
 options=('!libtool' '!emptydirs')
 install=heimdal.install
@@ -28,7 +28,7 @@
heimdal-kdc.rc
kadmind.rc
kpasswd.rc)
-md5sums=('69d7c4fc1a448f8feda1b478dad48fd0'
+md5sums=('963c09f1b14c41660be70b55fae9f163'
  '98e28f11f906c967aac22d6184102c9e'
  '6d5571bdedba2e2423b90bccdbac2c0a'
  '2feec3924ee5230b54175b4d4000c872'



[arch-commits] Commit in heimdal/trunk (PKGBUILD)

2010-03-31 Thread Allan McRae
Date: Wednesday, March 31, 2010 @ 19:52:49
  Author: allan
Revision: 75165

revert reversion...

Modified:
  heimdal/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-31 23:50:49 UTC (rev 75164)
+++ PKGBUILD2010-03-31 23:52:49 UTC (rev 75165)
@@ -13,8 +13,7 @@
 arch=('i686' 'x86_64')
 url=http://www.h5l.org/;
 license=('custom')
-depends=('db=4.8' 'openssl' 'sqlite3')
-# re-add e2fsprogs once its libcom_err is compatible
+depends=('db=4.8' 'openssl' 'sqlite3' 'e2fsprogs')
 backup=(etc/krb5.conf)
 options=('!libtool' '!emptydirs')
 install=heimdal.install



[arch-commits] Commit in heimdal/trunk (PKGBUILD heimdal-locate_plugin-header.patch)

2009-11-25 Thread Allan McRae
Date: Wednesday, November 25, 2009 @ 03:11:05
  Author: allan
Revision: 59608

upgpkg: heimdal 1.3.1-2
add temporary patch for samba build issue, remove conflicting man page 
(FS#17263)

Added:
  heimdal/trunk/heimdal-locate_plugin-header.patch
Modified:
  heimdal/trunk/PKGBUILD

+
 PKGBUILD   |8 +++-
 heimdal-locate_plugin-header.patch |   12 
 2 files changed, 19 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-25 00:00:12 UTC (rev 59607)
+++ PKGBUILD2009-11-25 08:11:05 UTC (rev 59608)
@@ -8,7 +8,7 @@
 
 pkgname=heimdal
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc=Implementation of Kerberos V5 libraries
 arch=('i686' 'x86_64')
 url=http://www.h5l.org/;
@@ -27,6 +27,7 @@
013_all_heimdal-pthread-lib.patch
014_all_heimdal-path.patch
heimdal-c++-safe-krb5_cccol_cursor.patch
+   heimdal-locate_plugin-header.patch
heimdal-kdc.rc
kadmind.rc
kpasswd.rc)
@@ -39,6 +40,7 @@
  '1b8665b771c4eb6b56ea8582c96e56e3'
  '8208ae8c0b6ff5ab4f64af1693e9e396'
  '522b08ae209126737413699b0c069c20'
+ '248ab80b44568171e432a23524f4fe39'
  'e59650992b9541a30dfce727a194f6e0'
  '1f2f86a67bbfddb7af581d35fdca9627'
  'f8f1eca95b9d3f2b4ebf2417b71b81cf')
@@ -53,6 +55,9 @@
   patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch || return 1
   patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch || return 1
   patch -Np1 -i ${srcdir}/heimdal-c++-safe-krb5_cccol_cursor.patch || return 1
+  
+  # temporary work-around for samba - 
https://bugzilla.samba.org/show_bug.cgi?id=6929
+  patch -Np1 -i ${srcdir}/heimdal-locate_plugin-header.patch || return 1
 
   sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
@@ -104,6 +109,7 @@
   rm ${pkgdir}/usr/lib/libcom_err.{a,so}  # e2fsprogs
   rm ${pkgdir}/usr/bin/compile_et # e2fsprogs
   rm ${pkgdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}*  # openssl (a 
bit overzealous...)
+  rm ${pkgdir}/usr/share/man/man3/os.3*   # erlang
 
   # Install the license
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \

Added: heimdal-locate_plugin-header.patch
===
--- heimdal-locate_plugin-header.patch  (rev 0)
+++ heimdal-locate_plugin-header.patch  2009-11-25 08:11:05 UTC (rev 59608)
@@ -0,0 +1,12 @@
+diff -Naur heimdal-1.3.1-old/lib/krb5/locate_plugin.h 
heimdal-1.3.1/lib/krb5/locate_plugin.h
+--- heimdal-1.3.1-old/lib/krb5/locate_plugin.h 2009-11-22 01:41:51.0 
+1000
 heimdal-1.3.1/lib/krb5/locate_plugin.h 2009-11-25 15:04:30.0 
+1000
+@@ -36,6 +36,8 @@
+ #ifndef HEIMDAL_KRB5_LOCATE_PLUGIN_H
+ #define HEIMDAL_KRB5_LOCATE_PLUGIN_H 1
+ 
++#include krb5.h
++
+ #define KRB5_PLUGIN_LOCATE service_locator
+ 
+ enum locate_service_type {