[arch-commits] Commit in ca-certificates/repos (3 files)

[Pierre Schmitz]

    Date: Monday, June 2, 2008 @ 03:43:01
  Author: pierre
Revision: 2455

Merged revisions 2443-2454 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/ca-certificates/trunk

........
  r2445 | pierre | 2008-06-02 06:45:47 +0000 (Mo, 02 Jun 2008) | 1 line
  
  cleanups
........
  r2451 | pierre | 2008-06-02 07:40:00 +0000 (Mo, 02 Jun 2008) | 2 lines
  
  upgpkg: ca-certificates 20080514-2
      added man page; added run-parts dependency to make hooks usable
........

Modified:
  ca-certificates/repos/testing-i686/	(properties)
  ca-certificates/repos/testing-i686/PKGBUILD
Deleted:
  ca-certificates/repos/testing-i686/no-hooks.patch

----------------+
 PKGBUILD       |   21 ++++++++-------------
 no-hooks.patch |   18 ------------------
 2 files changed, 8 insertions(+), 31 deletions(-)


Property changes on: ca-certificates/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /ca-certificates/trunk:1-2442
   + /ca-certificates/trunk:1-2454

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-06-02 07:41:41 UTC (rev 2454)
+++ testing-i686/PKGBUILD	2008-06-02 07:43:01 UTC (rev 2455)
@@ -3,35 +3,30 @@
 
 pkgname=ca-certificates
 pkgver=20080514
-pkgrel=1
+pkgrel=2
 pkgdesc='Common CA certificates'
 arch=('i686' 'x86_64')
 url='http://www.debian.org'
 license=('MPL' 'GPL')
-source=("http://ftp.de.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz" 'no-hooks.patch')
-depends=('openssl')
+source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz")
+depends=('openssl' 'run-parts')
 makedepends=('ruby')
 install=ca-certificates.install
 backup=('etc/ca-certificates.conf')
-md5sums=('25ca8aba089ffeb6d5051eee0027b427'
-         '1eff5b1fabbe60144846be6772b95aa6')
+md5sums=('25ca8aba089ffeb6d5051eee0027b427')
 
 build() {
 	cd $srcdir/$pkgname
 
-	# remove hooks support (uses run-parts which is debian specific)
-	patch -p0 -i $srcdir/no-hooks.patch
-
-	install -d -m755 $pkgdir/usr/{sbin,share/ca-certificates}
-	install -d -m755 $pkgdir/etc/ca-certificates/update.d
-
+	install -d -m755 $pkgdir/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates}}
+	install -D -m644 sbin/update-ca-certificates.8 $pkgdir/usr/share/man/man8/update-ca-certificates.8
 	make
 	make install DESTDIR=$pkgdir
 
 	(
-	echo "# Automatically generated by ${pkgname}_${pkgver}"
+	echo "# Automatically generated by ${pkgname}-${pkgver}"
 	echo "# $(date -u)"
-	echo "# Do not edit."
+	echo "# "
 	cd $pkgdir/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3-
 	) > $pkgdir/etc/ca-certificates.conf

Deleted: testing-i686/no-hooks.patch
===================================================================
--- testing-i686/no-hooks.patch	2008-06-02 07:41:41 UTC (rev 2454)
+++ testing-i686/no-hooks.patch	2008-06-02 07:43:01 UTC (rev 2455)
@@ -1,18 +0,0 @@
---- sbin/update-ca-certificates~	2008-06-02 01:51:30.000000000 +0200
-+++ sbin/update-ca-certificates	2008-06-02 01:51:30.000000000 +0200
-@@ -88,15 +88,6 @@
-     c_rehash .
-   fi
-   echo "done."
--
--  HOOKSDIR=/etc/ca-certificates/update.d
--  echo -n "Running hooks in $HOOKSDIR...."
--  VERBOSE_ARG=
--  [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
--  eval run-parts $VERB_ARG --test -- $HOOKSDIR | while read hook; do
--  printf -- "${removed:+$removed\n}${added:+$added\n}" | eval $hook
--  done
--  echo "done."
- else
-   echo "done."
- fi