Revision: 25493
http://sourceforge.net/p/gar/code/25493
Author: janholzh
Date: 2015-12-22 12:06:14 +0000 (Tue, 22 Dec 2015)
Log Message:
-----------
ca_certificates/trunk: update to new certs
Modified Paths:
--------------
csw/mgar/pkg/ca_certificates/trunk/Makefile
csw/mgar/pkg/ca_certificates/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ca_certificates/trunk/files/LICENSE
Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/Makefile 2015-12-22 11:33:41 UTC (rev
25492)
+++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2015-12-22 12:06:14 UTC (rev
25493)
@@ -28,13 +28,15 @@
###### Upstream and opencsw files information #######
MASTER_SITES =
http://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/
-DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates
ca-certificates.conf README.CSW
+DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates
ca-certificates.conf README.CSW LICENSE
DISTFILES += CSWcacertificates.postinstall CSWcacertificates.postremove
PRESERVECONF = $(sysconfdir)/ca-certificates.conf
MIGRATE_FILES = ca-certificates.conf
+LICENSE = LICENSE
+
##### Build and installation information #####
CONFIGURE_SCRIPTS =
@@ -54,15 +56,16 @@
done; \
done
-$(WORKDIR)/LICENSE: $(WORKDIR)/certdata.txt
- sed -ne '/BEGIN LICENSE BLOCK/,/END LICENSE BLOCK/p'
"$(WORKDIR)/certdata.txt" | grep -v "LICENSE BLOCK" \
- > "$(WORKDIR)/LICENSE"
+#$(WORKDIR)/LICENSE: $(WORKDIR)/certdata.txt
+# head -4 "$(WORKDIR)/certdata.txt" \
+# > "$(WORKDIR)/LICENSE"
install-certificates: $(WORKDIR)/certdata.txt
ginstall -d "$(DESTDIR)/$(sharedstatedir)/$(NAME)/mozilla"
cd "$(DESTDIR)/$(sharedstatedir)/$(NAME)/mozilla" && perl
"$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt"
-install-custom: install-certificates $(WORKDIR)/hash.db $(WORKDIR)/LICENSE
+#install-custom: install-certificates $(WORKDIR)/hash.db $(WORKDIR)/LICENSE
+install-custom: install-certificates $(WORKDIR)/hash.db
ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl"
ginstall -D "$(WORKDIR)/ca-certificates.conf"
"$(DESTDIR)/$(sysconfdir)/ca-certificates.conf"
ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs"
@@ -70,7 +73,7 @@
ginstall -D "$(WORKDIR)/update-ca-certificates"
"$(DESTDIR)/$(sbindir)/update-ca-certificates"
ginstall -D "$(WORKDIR)/hash.db"
"$(DESTDIR)/$(sharedstatedir)/$(NAME)/hash.db"
ginstall -D "$(WORKDIR)/README.CSW"
"$(DESTDIR)/$(docdir)/$(NAME)/README.CSW"
- ginstall -D "$(WORKDIR)/LICENSE" "$(DESTDIR)/$(docdir)/$(NAME)/license"
+ #ginstall -D "$(WORKDIR)/LICENSE" "$(DESTDIR)/$(docdir)/$(NAME)/license"
ginstall -d "$(PKGROOT)/$(prefix)/etc/ssl"
( cd "$(PKGROOT)/$(prefix)/etc/ssl/" && ln -s
"../../../..$(sysconfdir)/ssl/certs" )
Modified: csw/mgar/pkg/ca_certificates/trunk/checksums
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/checksums 2015-12-22 11:33:41 UTC
(rev 25492)
+++ csw/mgar/pkg/ca_certificates/trunk/checksums 2015-12-22 12:06:14 UTC
(rev 25493)
@@ -1 +1 @@
-c8fa899f4abbef043ea2b4143a78c935 certdata.txt
+e4686896732c382a7ee856426b6da398 certdata.txt
Added: csw/mgar/pkg/ca_certificates/trunk/files/LICENSE
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/files/LICENSE
(rev 0)
+++ csw/mgar/pkg/ca_certificates/trunk/files/LICENSE 2015-12-22 12:06:14 UTC
(rev 25493)
@@ -0,0 +1,4 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
