Revision: 7875
http://sourceforge.net/p/ipcop/svn/7875
Author: owes
Date: 2015-02-08 12:36:06 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
Move local ca-certificates to avoid trouble with openswan. Add a few
certificates that were not in the last cert update.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/ca-certificates
ipcop/trunk/lfs/ca-certificates
ipcop/trunk/src/scripts/upgrade.sh
ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
ipcop/trunk/updates/2.2.0/setup
Modified: ipcop/trunk/config/rootfiles/common/ca-certificates
===================================================================
--- ipcop/trunk/config/rootfiles/common/ca-certificates 2015-02-06 20:18:36 UTC
(rev 7874)
+++ ipcop/trunk/config/rootfiles/common/ca-certificates 2015-02-08 12:36:06 UTC
(rev 7875)
@@ -52,8 +52,13 @@
usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt
usr/share/ca-certificates/mozilla/Deutsche_Telekom_Root_CA_2.crt
usr/share/ca-certificates/mozilla/DigiCert_Assured_ID_Root_CA.crt
+usr/share/ca-certificates/mozilla/DigiCert_Assured_ID_Root_G2.crt
+usr/share/ca-certificates/mozilla/DigiCert_Assured_ID_Root_G3.crt
usr/share/ca-certificates/mozilla/DigiCert_Global_Root_CA.crt
+usr/share/ca-certificates/mozilla/DigiCert_Global_Root_G2.crt
+usr/share/ca-certificates/mozilla/DigiCert_Global_Root_G3.crt
usr/share/ca-certificates/mozilla/DigiCert_High_Assurance_EV_Root_CA.crt
+usr/share/ca-certificates/mozilla/DigiCert_Trusted_Root_G4.crt
usr/share/ca-certificates/mozilla/Digital_Signature_Trust_Co._Global_CA_1.crt
usr/share/ca-certificates/mozilla/Digital_Signature_Trust_Co._Global_CA_3.crt
usr/share/ca-certificates/mozilla/E-Guven_Kok_Elektronik_Sertifika_Hizmet_Saglayicisi.crt
@@ -96,8 +101,11 @@
usr/share/ca-certificates/mozilla/OISTE_WISeKey_Global_Root_GA_CA.crt
usr/share/ca-certificates/mozilla/PSCProcert.crt
usr/share/ca-certificates/mozilla/QuoVadis_Root_CA.crt
+usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_1_G3.crt
usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_2.crt
+usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_2_G3.crt
usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_3.crt
+usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_3_G3.crt
usr/share/ca-certificates/mozilla/RSA_Security_2048_v3.crt
usr/share/ca-certificates/mozilla/Root_CA_Generalitat_Valenciana.crt
usr/share/ca-certificates/mozilla/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.crt
@@ -158,10 +166,12 @@
usr/share/ca-certificates/mozilla/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.crt
usr/share/ca-certificates/mozilla/Visa_eCommerce_Root.crt
usr/share/ca-certificates/mozilla/WellsSecure_Public_Root_Certificate_Authority.crt
+usr/share/ca-certificates/mozilla/WoSign.crt
+usr/share/ca-certificates/mozilla/WoSign_China.crt
usr/share/ca-certificates/mozilla/XRamp_Global_CA_Root.crt
usr/share/ca-certificates/mozilla/certSIGN_ROOT_CA.crt
usr/share/ca-certificates/mozilla/ePKI_Root_Certification_Authority.crt
usr/share/ca-certificates/mozilla/thawte_Primary_Root_CA.crt
usr/share/ca-certificates/mozilla/thawte_Primary_Root_CA_-_G2.crt
usr/share/ca-certificates/mozilla/thawte_Primary_Root_CA_-_G3.crt
-#var/ipcop/ca/ca-certificates
+#var/ipcop/ca-local
Modified: ipcop/trunk/lfs/ca-certificates
===================================================================
--- ipcop/trunk/lfs/ca-certificates 2015-02-06 20:18:36 UTC (rev 7874)
+++ ipcop/trunk/lfs/ca-certificates 2015-02-08 12:36:06 UTC (rev 7875)
@@ -85,14 +85,14 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
# Modify location for 'local' certificates
- cd $(DIR_APP) && sed -i -e
's:LOCALCERTSDIR=.*:LOCALCERTSDIR=/var/ipcop/ca/ca-certificates:g'
sbin/update-ca-certificates
+ cd $(DIR_APP) && sed -i -e
's:LOCALCERTSDIR=.*:LOCALCERTSDIR=/var/ipcop/ca-local:g'
sbin/update-ca-certificates
# Remove Debian specific update hooks
cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(PKG_NAME)_remove-update-hooks.patch
# Progress messages from update-ca-certificates to logfile
cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(PKG_NAME)_add-logger.patch
install -d -m 755 /usr/share/ca-certificates
- install -d -m 755 /var/ipcop/ca/ca-certificates
+ install -d -m 755 /var/ipcop/ca-local
cd $(DIR_APP) && make SUBDIRS=mozilla
cd $(DIR_APP) && make install SUBDIRS=mozilla
Modified: ipcop/trunk/src/scripts/upgrade.sh
===================================================================
--- ipcop/trunk/src/scripts/upgrade.sh 2015-02-06 20:18:36 UTC (rev 7874)
+++ ipcop/trunk/src/scripts/upgrade.sh 2015-02-08 12:36:06 UTC (rev 7875)
@@ -110,6 +110,15 @@
# write new squid.conf (format changed with squid 3.3.x in 2.1.1
/usr/local/bin/makesquidconf.pl
+# Move local ca-certificates
+if [ -d /var/ipcop/ca/ca-certificates ]; then
+ if [ -e /var/ipcop/ca/ca-certificates/* ]; then
+ mv -f /var/ipcop/ca/ca-certificates/* /var/ipcop/ca-local
+ fi
+ rm -rf /var/ipcop/ca/ca-certificates
+ chown -R nobody.nobody /var/ipcop/ca-local
+fi
+
# CA certificate bundle
/usr/sbin/update-ca-certificates --fresh
Modified: ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
===================================================================
--- ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2015-02-06 20:18:36 UTC
(rev 7874)
+++ ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2015-02-08 12:36:06 UTC
(rev 7875)
@@ -33,6 +33,19 @@
/usr/local/sbin/setup
/usr/share/locale/pt_BR/LC_MESSAGES/ipcop.mo
##
+## ca-certificates-20141019
+/usr/sbin/update-ca-certificates
+/usr/share/ca-certificates/mozilla/DigiCert_Assured_ID_Root_G2.crt
+/usr/share/ca-certificates/mozilla/DigiCert_Assured_ID_Root_G3.crt
+/usr/share/ca-certificates/mozilla/DigiCert_Global_Root_G2.crt
+/usr/share/ca-certificates/mozilla/DigiCert_Global_Root_G3.crt
+/usr/share/ca-certificates/mozilla/DigiCert_Trusted_Root_G4.crt
+/usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_1_G3.crt
+/usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_2_G3.crt
+/usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_3_G3.crt
+/usr/share/ca-certificates/mozilla/WoSign.crt
+/usr/share/ca-certificates/mozilla/WoSign_China.crt
+##
## coreutils-8.23
/bin/cat
/bin/chgrp
Modified: ipcop/trunk/updates/2.2.0/setup
===================================================================
--- ipcop/trunk/updates/2.2.0/setup 2015-02-06 20:18:36 UTC (rev 7874)
+++ ipcop/trunk/updates/2.2.0/setup 2015-02-08 12:36:06 UTC (rev 7875)
@@ -75,7 +75,7 @@
/sbin/mkinitramfs --with-kernel=3.10-1 --with-firmware --many-modules
--with-list=/etc/modules.initramfs
# Adjust the changed config files
-# /usr/local/bin/upgrade.sh
+/usr/local/bin/upgrade.sh
# Remove old libraries (version specific)
/bin/rm -f /usr/lib/libglib-2.0.so.0.4000.0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
