diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2012-09-26 01:10:42 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:51:55 +0200 |
commit | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch) | |
tree | b428a16618e36ed864a8d76ea3435e19a452bf90 /source/n/ca-certificates | |
parent | 75a4a592e5ccda30715f93563d741b83e0dcf39e (diff) | |
download | current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz |
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!
We're perfectionists here at Slackware, so this release has been a long
time a-brewing. But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Thanks to everyone who helped make this happen. The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.
Have fun! :-)
Diffstat (limited to 'source/n/ca-certificates')
-rwxr-xr-x | source/n/ca-certificates/ca-certificates.SlackBuild | 18 | ||||
-rw-r--r-- | source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff | 94 | ||||
-rw-r--r-- | source/n/ca-certificates/cacerts-20090814-remove_debconf.diff | 12 | ||||
-rw-r--r-- | source/n/ca-certificates/doinst.sh | 4 | ||||
-rw-r--r-- | source/n/ca-certificates/patches/fixup_DESTDIR.diff | 64 | ||||
-rw-r--r-- | source/n/ca-certificates/patches/fixup_update-ca-certificates.diff (renamed from source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff) | 6 | ||||
-rw-r--r-- | source/n/ca-certificates/patches/remove_debconf.diff | 12 | ||||
-rw-r--r-- | source/n/ca-certificates/setup.11.cacerts | 3 |
8 files changed, 96 insertions, 117 deletions
diff --git a/source/n/ca-certificates/ca-certificates.SlackBuild b/source/n/ca-certificates/ca-certificates.SlackBuild index fc455b14..b3efd180 100755 --- a/source/n/ca-certificates/ca-certificates.SlackBuild +++ b/source/n/ca-certificates/ca-certificates.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for ca-certificates -# Copyright 2009 Robby Workman Northport, AL, USA +# Copyright 2009,2011 Robby Workman Northport, AL, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ca-certificates -VERSION=${VERSION:-20090814} +VERSION=${VERSION:-20120623} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -44,9 +45,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/cacerts-$VERSION-remove_debconf.diff.gz | patch -p1 || exit 1 -zcat $CWD/cacerts-$VERSION-fixup_DESTDIR.diff.gz | patch -p1 || exit 1 -zcat $CWD/cacerts-$VERSION-fixup_update-ca-certificates.diff.gz | patch -p1 || exit 1 +zcat $CWD/patches/remove_debconf.diff.gz | patch -p1 || exit 1 +zcat $CWD/patches/fixup_DESTDIR.diff.gz | patch -p1 || exit 1 +zcat $CWD/patches/fixup_update-ca-certificates.diff.gz | patch -p1 || exit 1 make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -65,7 +66,10 @@ gzip -9c sbin/update-ca-certificates.8 > \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mv debian/NEWS debian/NEWS.Debian cp -a debian/NEWS.Debian debian/README.Debian $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/var/log/setup +cat $CWD/setup.11.cacerts > $PKG/var/log/setup/setup.11.cacerts +chmod 755 $PKG/var/log/setup/setup.11.cacerts mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff b/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff deleted file mode 100644 index b70ca654..00000000 --- a/source/n/ca-certificates/cacerts-20090814-fixup_DESTDIR.diff +++ /dev/null @@ -1,94 +0,0 @@ -diff -Nur ca-certificates-20090814.orig/Makefile ca-certificates-20090814/Makefile ---- ca-certificates-20090814.orig/Makefile 2009-07-08 16:18:57.000000000 -0500 -+++ ca-certificates-20090814/Makefile 2009-12-17 00:48:14.499550845 -0600 -@@ -17,7 +17,7 @@ - - install: - for dir in $(SUBDIRS); do \ -- mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \ -+ mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \ - $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \ - done - for dir in sbin; do \ -diff -Nur ca-certificates-20090814.orig/brasil.gov.br/Makefile ca-certificates-20090814/brasil.gov.br/Makefile ---- ca-certificates-20090814.orig/brasil.gov.br/Makefile 2007-02-02 00:23:19.000000000 -0600 -+++ ca-certificates-20090814/brasil.gov.br/Makefile 2009-12-17 00:48:14.499550845 -0600 -@@ -8,5 +8,6 @@ - - install: - for p in *.crt; do \ -+ mkdir -p $(CERTSDIR) ; \ - install -m 644 $$p $(CERTSDIR)/$$p ; \ - done -diff -Nur ca-certificates-20090814.orig/cacert.org/Makefile ca-certificates-20090814/cacert.org/Makefile ---- ca-certificates-20090814.orig/cacert.org/Makefile 2009-07-08 16:19:37.000000000 -0500 -+++ ca-certificates-20090814/cacert.org/Makefile 2009-12-17 00:48:14.499550845 -0600 -@@ -9,5 +9,6 @@ - - install: - cat root.crt class3.crt > cacert.org.crt -+ mkdir -p $(CERTSDIR) - install -m 644 cacert.org.crt $(CERTSDIR)/cacert.org.crt - -diff -Nur ca-certificates-20090814.orig/gouv.fr/Makefile ca-certificates-20090814/gouv.fr/Makefile ---- ca-certificates-20090814.orig/gouv.fr/Makefile 2008-06-23 13:57:45.000000000 -0500 -+++ ca-certificates-20090814/gouv.fr/Makefile 2009-12-17 00:48:14.500550426 -0600 -@@ -8,6 +8,7 @@ - - install: - for p in *.crt; do \ -+ mkdir -p $(CERTSDIR) ; \ - install -m 644 $$p $(CERTSDIR)/$$p ; \ - done - -diff -Nur ca-certificates-20090814.orig/mozilla/Makefile ca-certificates-20090814/mozilla/Makefile ---- ca-certificates-20090814.orig/mozilla/Makefile 2009-06-24 05:56:54.000000000 -0500 -+++ ca-certificates-20090814/mozilla/Makefile 2009-12-17 00:48:14.500550426 -0600 -@@ -10,5 +10,6 @@ - - install: - for p in *.crt; do \ -+ mkdir -p $(CERTSDIR) ; \ - install -m 644 $$p $(CERTSDIR)/$$p ; \ - done -diff -Nur ca-certificates-20090814.orig/sbin/Makefile ca-certificates-20090814/sbin/Makefile ---- ca-certificates-20090814.orig/sbin/Makefile 2007-02-02 00:23:19.000000000 -0600 -+++ ca-certificates-20090814/sbin/Makefile 2009-12-17 00:49:05.976571309 -0600 -@@ -8,4 +8,5 @@ - clean: - - install: -+ mkdir -p $(DESTDIR)/usr/sbin - install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/ -diff -Nur ca-certificates-20090814.orig/signet.pl/Makefile ca-certificates-20090814/signet.pl/Makefile ---- ca-certificates-20090814.orig/signet.pl/Makefile 2007-02-02 00:23:19.000000000 -0600 -+++ ca-certificates-20090814/signet.pl/Makefile 2009-12-17 00:48:14.501550915 -0600 -@@ -8,5 +8,6 @@ - - install: - for p in *.crt; do \ -+ mkdir -p $(CERTSDIR) ; \ - install -m 644 $$p $(CERTSDIR)/$$p ; \ - done -diff -Nur ca-certificates-20090814.orig/spi-inc.org/Makefile ca-certificates-20090814/spi-inc.org/Makefile ---- ca-certificates-20090814.orig/spi-inc.org/Makefile 2007-02-02 00:23:19.000000000 -0600 -+++ ca-certificates-20090814/spi-inc.org/Makefile 2009-12-17 00:48:14.501550915 -0600 -@@ -8,6 +8,7 @@ - - install: - for p in *.crt; do \ -+ mkdir -p $(CERTSDIR) ; \ - install -m 644 $$p $(CERTSDIR)/$$p ; \ - done - -diff -Nur ca-certificates-20090814.orig/telesec.de/Makefile ca-certificates-20090814/telesec.de/Makefile ---- ca-certificates-20090814.orig/telesec.de/Makefile 2008-03-19 09:03:09.000000000 -0500 -+++ ca-certificates-20090814/telesec.de/Makefile 2009-12-17 00:48:14.566586954 -0600 -@@ -8,6 +8,7 @@ - - install: - for p in *.crt; do \ -+ mkdir -p $(CERTSDIR) ; \ - install -m 644 $$p $(CERTSDIR)/$$p ; \ - done - diff --git a/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff b/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff deleted file mode 100644 index c99aa2fa..00000000 --- a/source/n/ca-certificates/cacerts-20090814-remove_debconf.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur ca-certificates-20090814.orig/Makefile ca-certificates-20090814/Makefile ---- ca-certificates-20090814.orig/Makefile 2009-07-08 16:18:57.000000000 -0500 -+++ ca-certificates-20090814/Makefile 2009-12-17 00:44:30.540551055 -0600 -@@ -3,7 +3,7 @@ - # - - CERTSDIR = /usr/share/ca-certificates --SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr -+SUBDIRS = spi-inc.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr - - all: - for dir in $(SUBDIRS); do \ diff --git a/source/n/ca-certificates/doinst.sh b/source/n/ca-certificates/doinst.sh index e8cd8cce..cfd7d795 100644 --- a/source/n/ca-certificates/doinst.sh +++ b/source/n/ca-certificates/doinst.sh @@ -13,5 +13,7 @@ config() { config etc/ca-certificates.conf.new -chroot . usr/sbin/update-ca-certificates --fresh 1>/dev/null 2>/dev/null +if [ -x /usr/sbin/update-ca-certificates ]; then + /usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null +fi diff --git a/source/n/ca-certificates/patches/fixup_DESTDIR.diff b/source/n/ca-certificates/patches/fixup_DESTDIR.diff new file mode 100644 index 00000000..291848f6 --- /dev/null +++ b/source/n/ca-certificates/patches/fixup_DESTDIR.diff @@ -0,0 +1,64 @@ +diff -Nur ca-certificates-20111211.orig/Makefile ca-certificates-20111211/Makefile +--- ca-certificates-20111211.orig/Makefile 2011-12-11 13:54:02.000000000 -0600 ++++ ca-certificates-20111211/Makefile 2011-12-17 23:05:37.590951594 -0600 +@@ -17,7 +17,7 @@ + + install: + for dir in $(SUBDIRS); do \ +- mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \ ++ mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \ + $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \ + done + for dir in sbin; do \ +diff -Nur ca-certificates-20111211.orig/cacert.org/Makefile ca-certificates-20111211/cacert.org/Makefile +--- ca-certificates-20111211.orig/cacert.org/Makefile 2011-12-11 13:54:02.000000000 -0600 ++++ ca-certificates-20111211/cacert.org/Makefile 2011-12-17 23:06:16.927521153 -0600 +@@ -9,5 +9,6 @@ + + install: + cat root.crt class3.crt > cacert.org.crt ++ mkdir -p $(CERTSDIR) + install -m 644 cacert.org.crt $(CERTSDIR)/cacert.org.crt + +diff -Nur ca-certificates-20111211.orig/debconf.org/Makefile ca-certificates-20111211/debconf.org/Makefile +--- ca-certificates-20111211.orig/debconf.org/Makefile 2011-12-11 13:54:02.000000000 -0600 ++++ ca-certificates-20111211/debconf.org/Makefile 2011-12-17 23:06:27.118409644 -0600 +@@ -7,6 +7,7 @@ + clean: + + install: ++ mkdir -p $(CERTSDIR) + for p in *.crt; do \ + install -m 644 $$p $(CERTSDIR)/$$p ; \ + done +diff -Nur ca-certificates-20111211.orig/mozilla/Makefile ca-certificates-20111211/mozilla/Makefile +--- ca-certificates-20111211.orig/mozilla/Makefile 2011-12-11 13:54:02.000000000 -0600 ++++ ca-certificates-20111211/mozilla/Makefile 2011-12-17 23:06:34.556328253 -0600 +@@ -9,6 +9,7 @@ + -rm -f *.crt + + install: ++ mkdir -p $(CERTSDIR) + for p in *.crt; do \ + install -m 644 $$p $(CERTSDIR)/$$p ; \ + done +diff -Nur ca-certificates-20111211.orig/sbin/Makefile ca-certificates-20111211/sbin/Makefile +--- ca-certificates-20111211.orig/sbin/Makefile 2011-12-11 13:54:02.000000000 -0600 ++++ ca-certificates-20111211/sbin/Makefile 2011-12-17 23:07:03.841007810 -0600 +@@ -8,4 +8,5 @@ + clean: + + install: ++ mkdir -p $(DESTDIR)/usr/sbin + install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/ +diff -Nur ca-certificates-20111211.orig/spi-inc.org/Makefile ca-certificates-20111211/spi-inc.org/Makefile +--- ca-certificates-20111211.orig/spi-inc.org/Makefile 2011-12-11 13:54:02.000000000 -0600 ++++ ca-certificates-20111211/spi-inc.org/Makefile 2011-12-17 23:08:18.499190893 -0600 +@@ -7,6 +7,7 @@ + clean: + + install: ++ mkdir -p $PKG/$(CERTSDIR) + for p in *.crt; do \ + install -m 644 $$p $(CERTSDIR)/$$p ; \ + done diff --git a/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff b/source/n/ca-certificates/patches/fixup_update-ca-certificates.diff index 3c9e08b4..8b0435b3 100644 --- a/source/n/ca-certificates/cacerts-20090814-fixup_update-ca-certificates.diff +++ b/source/n/ca-certificates/patches/fixup_update-ca-certificates.diff @@ -1,6 +1,6 @@ -diff -Nur ca-certificates-20090814.orig/sbin/update-ca-certificates ca-certificates-20090814/sbin/update-ca-certificates ---- ca-certificates-20090814.orig/sbin/update-ca-certificates 2009-07-08 16:23:12.000000000 -0500 -+++ ca-certificates-20090814/sbin/update-ca-certificates 2009-12-17 00:42:41.760550636 -0600 +diff -Nur ca-certificates-20110502.orig//sbin/update-ca-certificates ca-certificates-20110502/sbin/update-ca-certificates +--- ca-certificates-20110502.orig//sbin/update-ca-certificates 2009-07-08 16:23:12.000000000 -0500 ++++ ca-certificates-20110502/sbin/update-ca-certificates 2011-07-05 17:37:01.842932741 -0500 @@ -148,9 +148,7 @@ HOOKSDIR=/etc/ca-certificates/update.d diff --git a/source/n/ca-certificates/patches/remove_debconf.diff b/source/n/ca-certificates/patches/remove_debconf.diff new file mode 100644 index 00000000..58fce422 --- /dev/null +++ b/source/n/ca-certificates/patches/remove_debconf.diff @@ -0,0 +1,12 @@ +diff -Nur ca-certificates-20111211.orig/Makefile ca-certificates-20111211/Makefile +--- ca-certificates-20111211.orig/Makefile 2011-12-17 23:10:21.709842750 -0600 ++++ ca-certificates-20111211/Makefile 2011-12-17 23:10:10.096969815 -0600 +@@ -3,7 +3,7 @@ + # + + CERTSDIR = /usr/share/ca-certificates +-SUBDIRS = mozilla cacert.org debconf.org spi-inc.org ++SUBDIRS = mozilla cacert.org spi-inc.org + + all: + for dir in $(SUBDIRS); do \ diff --git a/source/n/ca-certificates/setup.11.cacerts b/source/n/ca-certificates/setup.11.cacerts new file mode 100644 index 00000000..328b61c0 --- /dev/null +++ b/source/n/ca-certificates/setup.11.cacerts @@ -0,0 +1,3 @@ +#!/bin/sh +#BLURB="Rebuild SSL certificate database." +chroot . usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null |