[csw-devel] SF.net SVN: gar:[16084] csw/mgar/pkg/ca_certificates/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat Nov 5 23:38:33 CET 2011
Revision: 16084
http://gar.svn.sourceforge.net/gar/?rev=16084&view=rev
Author: chninkel
Date: 2011-11-05 22:38:33 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
ca_certificates: switched to gar v2
Modified Paths:
--------------
csw/mgar/pkg/ca_certificates/trunk/Makefile
csw/mgar/pkg/ca_certificates/trunk/checksums
csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl
csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates
Removed Paths:
-------------
csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend
csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec
Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/Makefile 2011-11-05 22:26:07 UTC (rev 16083)
+++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2011-11-05 22:38:33 UTC (rev 16084)
@@ -1,6 +1,19 @@
-NAME = ca-certificates
+#####################################################################
+# OpenCSW build recipe for ca-certificates
+#
+# Copyright 2009 Yann Rouillard <yann at pleiades.fr.eu.org>
+# All rights reserved. Use is subject to license terms.
+#
+# Redistribution and/or use, with or without modification, is
+# permitted. This software is without warranty of any kind. The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#####################################################################
+
+###### Package information #######
+
+NAME = ca_certificates
VERSION = $(shell date '+%Y%m%d')
-GARTYPE = v1
CATEGORIES = xtra
DESCRIPTION = CA certificates
@@ -8,13 +21,20 @@
CA certificates
endef
+PACKAGES = CSWcacertificates
+
+ARCHALL = 1
+
+###### 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 += $(call admfiles,CSWcacertificates,depend postinstall postremove)
+DISTFILES += CSWcacertificates.postinstall CSWcacertificates.postremove
-# We define upstream file regex so we can be notifed of new upstream software release
-# UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
+PRESERVECONF = $(sysconfdir)/ca-certificates.conf
+##### Build and installation information #####
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_SCRIPTS =
@@ -22,8 +42,6 @@
TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
-SPKG_CLASSES = none cswpreserveconf
-
include gar/category.mk
$(WORKDIR)/hash.db: install-certificates
@@ -42,9 +60,11 @@
install-custom: install-certificates $(WORKDIR)/hash.db $(WORKDIR)/LICENSE
ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl"
+ ginstall -D "$(WORKDIR)/ca-certificates.conf" "$(DESTDIR)/$(sysconfdir)/ca-certificates.conf"
ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs"
ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates"
ginstall -D "$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates"
- ginstall -D "$(WORKDIR)/hash.db" "$(DESTDIR)/$(sharedstatedir)/ca-certificates/hash.db"
- ginstall -D "$(WORKDIR)/README.CSW" "$(DESTDIR)/$(docdir)/ca-certificates/README.CSW"
+ ginstall -D "$(WORKDIR)/hash.db" "$(DESTDIR)/$(localstatedir)/cacertificates/hash.db"
+ ginstall -D "$(WORKDIR)/README.CSW" "$(DESTDIR)/$(docdir)/cacertificates/README.CSW"
+ ginstall -D "$(WORKDIR)/LICENSE" "$(DESTDIR)/$(docdir)/cacertificates/license"
Modified: csw/mgar/pkg/ca_certificates/trunk/checksums
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/checksums 2011-11-05 22:26:07 UTC (rev 16083)
+++ csw/mgar/pkg/ca_certificates/trunk/checksums 2011-11-05 22:38:33 UTC (rev 16084)
@@ -1,9 +1 @@
-dabe696bb410d748fbaedbc5f18b11e2 download/certdata.txt
-77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl
-8163827375c4cb08f9734930adb06ee2 download/update-ca-certificates
-b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf
-c7fd74bceddf27039a26a5f1dfede163 download/README.CSW
-787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec
-31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend
-1fb44412e1ee60dd4f7bd9bd66d4af34 download/CSWcacertificates.postinstall
-0e166bd746f506c06e1001b0c6274958 download/CSWcacertificates.postremove
+c8fa899f4abbef043ea2b4143a78c935 certdata.txt
Deleted: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend 2011-11-05 22:26:07 UTC (rev 16083)
+++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend 2011-11-05 22:38:33 UTC (rev 16084)
@@ -1 +0,0 @@
-P CSWcswclassutils
Deleted: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec 2011-11-05 22:26:07 UTC (rev 16083)
+++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec 2011-11-05 22:38:33 UTC (rev 16084)
@@ -1,7 +0,0 @@
-%var bitname ca_certificates
-%var pkgname CSWcacertificates
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKDIR}/LICENSE
-%prototype:merge
-e cswpreserveconf /opt/csw/etc/ca-certificates.conf.csw=ca-certificates.conf 0644 root bin
Modified: csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2011-11-05 22:26:07 UTC (rev 16083)
+++ csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2011-11-05 22:38:33 UTC (rev 16084)
@@ -18,7 +18,34 @@
return $res;
}
+require Encode;
+use Unicode::Normalize;
+sub strip_diacritics
+{
+ my $string = shift;
+
+ my $sub = sub {
+ my $val = shift;
+ return (chr(hex($val)));
+ };
+
+ $string =~ s/\\x([0-9a-fA-F]{2})/$sub->($1)/ge;
+ $string =~ s/\xe4/ae/g;
+ $string =~ s/\xf1/ny/g;
+ $string =~ s/\xf6/oe/g;
+ $string =~ s/\xfc/ue/g;
+ $string =~ s/\xff/yu/g;
+
+ $string = NFD( $string );
+ $string =~ s/\pM//g;
+ $string =~ s/[^\0-\x80]//g;
+
+ return ($string);
+}
+
+
+
while (my $line = <STDIN>) {
next if $line =~ /^#/;
@@ -35,6 +62,7 @@
$val =~ s/"$//;
$val =~ s/[\/\s,]/_/g;
$val =~ s/[()]//g;
+ $val = strip_diacritics ($val);
$fname = $val . ".pem";
next;
}
Modified: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2011-11-05 22:26:07 UTC (rev 16083)
+++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2011-11-05 22:38:33 UTC (rev 16084)
@@ -21,10 +21,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-CACERTS_CONF=/opt/csw/etc/ca-certificates.conf
+CACERTS_CONF=/etc/opt/csw/ca-certificates.conf
CACERTS_DIR=/opt/csw/share/ca-certificates
CERTBUNDLE=ca-certificates.crt
-CERTSDIR=/opt/csw/etc/ssl/certs
+CERTSDIR=/etc/opt/csw/ssl/certs
# find the certificate files corresponding to the given pattern
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list