Revision: 7443 http://sourceforge.net/p/ipcop/svn/7443 Author: owes Date: 2014-04-09 11:42:43 +0000 (Wed, 09 Apr 2014) Log Message: ----------- Add CA cerificate bundle (from Mozilla via Debian). Allows to send encrypted mail which is required by more and more mail servers. Addition to update package will follow soon.
Modified Paths: -------------- ipcop/trunk/make.sh Added Paths: ----------- ipcop/trunk/config/rootfiles/common/ca-certificates ipcop/trunk/lfs/ca-certificates ipcop/trunk/src/patches/ca-certificates_add-logger.patch ipcop/trunk/src/patches/ca-certificates_remove-update-hooks.patch Added: ipcop/trunk/config/rootfiles/common/ca-certificates =================================================================== --- ipcop/trunk/config/rootfiles/common/ca-certificates (rev 0) +++ ipcop/trunk/config/rootfiles/common/ca-certificates 2014-04-09 11:42:43 UTC (rev 7443) @@ -0,0 +1,168 @@ +#etc/ca-certificates +etc/ca-certificates.conf +usr/sbin/update-ca-certificates +#usr/share/ca-certificates +#usr/share/ca-certificates/mozilla +usr/share/ca-certificates/mozilla/A-Trust-nQual-03.crt +usr/share/ca-certificates/mozilla/ACCVRAIZ1.crt +usr/share/ca-certificates/mozilla/ACEDICOM_Root.crt +usr/share/ca-certificates/mozilla/AC_Raíz_Certicámara_S.A..crt +usr/share/ca-certificates/mozilla/Actalis_Authentication_Root_CA.crt +usr/share/ca-certificates/mozilla/AddTrust_External_Root.crt +usr/share/ca-certificates/mozilla/AddTrust_Low-Value_Services_Root.crt +usr/share/ca-certificates/mozilla/AddTrust_Public_Services_Root.crt +usr/share/ca-certificates/mozilla/AddTrust_Qualified_Certificates_Root.crt +usr/share/ca-certificates/mozilla/AffirmTrust_Commercial.crt +usr/share/ca-certificates/mozilla/AffirmTrust_Networking.crt +usr/share/ca-certificates/mozilla/AffirmTrust_Premium.crt +usr/share/ca-certificates/mozilla/AffirmTrust_Premium_ECC.crt +usr/share/ca-certificates/mozilla/America_Online_Root_Certification_Authority_1.crt +usr/share/ca-certificates/mozilla/America_Online_Root_Certification_Authority_2.crt +usr/share/ca-certificates/mozilla/ApplicationCA_-_Japanese_Government.crt +usr/share/ca-certificates/mozilla/Atos_TrustedRoot_2011.crt +usr/share/ca-certificates/mozilla/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.crt +usr/share/ca-certificates/mozilla/Baltimore_CyberTrust_Root.crt +usr/share/ca-certificates/mozilla/Buypass_Class_2_CA_1.crt +usr/share/ca-certificates/mozilla/Buypass_Class_2_Root_CA.crt +usr/share/ca-certificates/mozilla/Buypass_Class_3_CA_1.crt +usr/share/ca-certificates/mozilla/Buypass_Class_3_Root_CA.crt +usr/share/ca-certificates/mozilla/CA_Disig.crt +usr/share/ca-certificates/mozilla/CA_Disig_Root_R1.crt +usr/share/ca-certificates/mozilla/CA_Disig_Root_R2.crt +usr/share/ca-certificates/mozilla/CNNIC_ROOT.crt +usr/share/ca-certificates/mozilla/COMODO_Certification_Authority.crt +usr/share/ca-certificates/mozilla/COMODO_ECC_Certification_Authority.crt +usr/share/ca-certificates/mozilla/Camerfirma_Chambers_of_Commerce_Root.crt +usr/share/ca-certificates/mozilla/Camerfirma_Global_Chambersign_Root.crt +usr/share/ca-certificates/mozilla/Certigna.crt +usr/share/ca-certificates/mozilla/Certinomis_-_Autorité_Racine.crt +usr/share/ca-certificates/mozilla/Certplus_Class_2_Primary_CA.crt +usr/share/ca-certificates/mozilla/Certum_Root_CA.crt +usr/share/ca-certificates/mozilla/Certum_Trusted_Network_CA.crt +usr/share/ca-certificates/mozilla/Chambers_of_Commerce_Root_-_2008.crt +usr/share/ca-certificates/mozilla/China_Internet_Network_Information_Center_EV_Certificates_Root.crt +usr/share/ca-certificates/mozilla/ComSign_CA.crt +usr/share/ca-certificates/mozilla/ComSign_Secured_CA.crt +usr/share/ca-certificates/mozilla/Comodo_AAA_Services_root.crt +usr/share/ca-certificates/mozilla/Comodo_Secure_Services_root.crt +usr/share/ca-certificates/mozilla/Comodo_Trusted_Services_root.crt +usr/share/ca-certificates/mozilla/Cybertrust_Global_Root.crt +usr/share/ca-certificates/mozilla/D-TRUST_Root_Class_3_CA_2_2009.crt +usr/share/ca-certificates/mozilla/D-TRUST_Root_Class_3_CA_2_EV_2009.crt +usr/share/ca-certificates/mozilla/DST_ACES_CA_X6.crt +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_Global_Root_CA.crt +usr/share/ca-certificates/mozilla/DigiCert_High_Assurance_EV_Root_CA.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 +usr/share/ca-certificates/mozilla/E-Tugra_Certification_Authority.crt +usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt +usr/share/ca-certificates/mozilla/EC-ACC.crt +usr/share/ca-certificates/mozilla/EE_Certification_Centre_Root_CA.crt +usr/share/ca-certificates/mozilla/Entrust.net_Premium_2048_Secure_Server_CA.crt +usr/share/ca-certificates/mozilla/Entrust_Root_Certification_Authority.crt +usr/share/ca-certificates/mozilla/Equifax_Secure_CA.crt +usr/share/ca-certificates/mozilla/Equifax_Secure_Global_eBusiness_CA.crt +usr/share/ca-certificates/mozilla/Equifax_Secure_eBusiness_CA_1.crt +usr/share/ca-certificates/mozilla/GeoTrust_Global_CA.crt +usr/share/ca-certificates/mozilla/GeoTrust_Global_CA_2.crt +usr/share/ca-certificates/mozilla/GeoTrust_Primary_Certification_Authority.crt +usr/share/ca-certificates/mozilla/GeoTrust_Primary_Certification_Authority_-_G2.crt +usr/share/ca-certificates/mozilla/GeoTrust_Primary_Certification_Authority_-_G3.crt +usr/share/ca-certificates/mozilla/GeoTrust_Universal_CA.crt +usr/share/ca-certificates/mozilla/GeoTrust_Universal_CA_2.crt +usr/share/ca-certificates/mozilla/GlobalSign_Root_CA.crt +usr/share/ca-certificates/mozilla/GlobalSign_Root_CA_-_R2.crt +usr/share/ca-certificates/mozilla/GlobalSign_Root_CA_-_R3.crt +usr/share/ca-certificates/mozilla/Global_Chambersign_Root_-_2008.crt +usr/share/ca-certificates/mozilla/Go_Daddy_Class_2_CA.crt +usr/share/ca-certificates/mozilla/Go_Daddy_Root_Certificate_Authority_-_G2.crt +usr/share/ca-certificates/mozilla/Hellenic_Academic_and_Research_Institutions_RootCA_2011.crt +usr/share/ca-certificates/mozilla/Hongkong_Post_Root_CA_1.crt +usr/share/ca-certificates/mozilla/IGC_A.crt +usr/share/ca-certificates/mozilla/Izenpe.com.crt +usr/share/ca-certificates/mozilla/Juur-SK.crt +usr/share/ca-certificates/mozilla/Microsec_e-Szigno_Root_CA.crt +usr/share/ca-certificates/mozilla/Microsec_e-Szigno_Root_CA_2009.crt +usr/share/ca-certificates/mozilla/NetLock_Arany_=Class_Gold=_Főtanúsítvány.crt +usr/share/ca-certificates/mozilla/NetLock_Business_=Class_B=_Root.crt +usr/share/ca-certificates/mozilla/NetLock_Express_=Class_C=_Root.crt +usr/share/ca-certificates/mozilla/NetLock_Notary_=Class_A=_Root.crt +usr/share/ca-certificates/mozilla/NetLock_Qualified_=Class_QA=_Root.crt +usr/share/ca-certificates/mozilla/Network_Solutions_Certificate_Authority.crt +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_2.crt +usr/share/ca-certificates/mozilla/QuoVadis_Root_CA_3.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 +usr/share/ca-certificates/mozilla/SG_TRUST_SERVICES_RACINE.crt +usr/share/ca-certificates/mozilla/SecureSign_RootCA11.crt +usr/share/ca-certificates/mozilla/SecureTrust_CA.crt +usr/share/ca-certificates/mozilla/Secure_Global_CA.crt +usr/share/ca-certificates/mozilla/Security_Communication_EV_RootCA1.crt +usr/share/ca-certificates/mozilla/Security_Communication_RootCA2.crt +usr/share/ca-certificates/mozilla/Security_Communication_Root_CA.crt +usr/share/ca-certificates/mozilla/Sonera_Class_1_Root_CA.crt +usr/share/ca-certificates/mozilla/Sonera_Class_2_Root_CA.crt +usr/share/ca-certificates/mozilla/Staat_der_Nederlanden_Root_CA.crt +usr/share/ca-certificates/mozilla/Staat_der_Nederlanden_Root_CA_-_G2.crt +usr/share/ca-certificates/mozilla/Starfield_Class_2_CA.crt +usr/share/ca-certificates/mozilla/Starfield_Root_Certificate_Authority_-_G2.crt +usr/share/ca-certificates/mozilla/Starfield_Services_Root_Certificate_Authority_-_G2.crt +usr/share/ca-certificates/mozilla/StartCom_Certification_Authority.crt +usr/share/ca-certificates/mozilla/StartCom_Certification_Authority_2.crt +usr/share/ca-certificates/mozilla/StartCom_Certification_Authority_G2.crt +usr/share/ca-certificates/mozilla/SwissSign_Gold_CA_-_G2.crt +usr/share/ca-certificates/mozilla/SwissSign_Platinum_CA_-_G2.crt +usr/share/ca-certificates/mozilla/SwissSign_Silver_CA_-_G2.crt +usr/share/ca-certificates/mozilla/Swisscom_Root_CA_1.crt +usr/share/ca-certificates/mozilla/Swisscom_Root_CA_2.crt +usr/share/ca-certificates/mozilla/Swisscom_Root_EV_CA_2.crt +usr/share/ca-certificates/mozilla/T-TeleSec_GlobalRoot_Class_2.crt +usr/share/ca-certificates/mozilla/T-TeleSec_GlobalRoot_Class_3.crt +usr/share/ca-certificates/mozilla/TC_TrustCenter_Class_2_CA_II.crt +usr/share/ca-certificates/mozilla/TC_TrustCenter_Class_3_CA_II.crt +usr/share/ca-certificates/mozilla/TC_TrustCenter_Universal_CA_I.crt +usr/share/ca-certificates/mozilla/TDC_Internet_Root_CA.crt +usr/share/ca-certificates/mozilla/TURKTRUST_Certificate_Services_Provider_Root_1.crt +usr/share/ca-certificates/mozilla/TURKTRUST_Certificate_Services_Provider_Root_2.crt +usr/share/ca-certificates/mozilla/TURKTRUST_Certificate_Services_Provider_Root_2007.crt +usr/share/ca-certificates/mozilla/TWCA_Global_Root_CA.crt +usr/share/ca-certificates/mozilla/TWCA_Root_Certification_Authority.crt +usr/share/ca-certificates/mozilla/Taiwan_GRCA.crt +usr/share/ca-certificates/mozilla/TeliaSonera_Root_CA_v1.crt +usr/share/ca-certificates/mozilla/Thawte_Premium_Server_CA.crt +usr/share/ca-certificates/mozilla/Thawte_Server_CA.crt +usr/share/ca-certificates/mozilla/Trustis_FPS_Root_CA.crt +usr/share/ca-certificates/mozilla/TÜBİTAK_UEKAE_Kök_Sertifika_Hizmet_Sağlayıcısı_-_Sürüm_3.crt +usr/share/ca-certificates/mozilla/UTN_DATACorp_SGC_Root_CA.crt +usr/share/ca-certificates/mozilla/UTN_USERFirst_Email_Root_CA.crt +usr/share/ca-certificates/mozilla/UTN_USERFirst_Hardware_Root_CA.crt +usr/share/ca-certificates/mozilla/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.crt +usr/share/ca-certificates/mozilla/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.crt +usr/share/ca-certificates/mozilla/VeriSign_Universal_Root_Certification_Authority.crt +usr/share/ca-certificates/mozilla/Verisign_Class_1_Public_Primary_Certification_Authority.crt +usr/share/ca-certificates/mozilla/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.crt +usr/share/ca-certificates/mozilla/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.crt +usr/share/ca-certificates/mozilla/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.crt +usr/share/ca-certificates/mozilla/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.crt +usr/share/ca-certificates/mozilla/Verisign_Class_3_Public_Primary_Certification_Authority.crt +usr/share/ca-certificates/mozilla/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.crt +usr/share/ca-certificates/mozilla/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.crt +usr/share/ca-certificates/mozilla/Verisign_Class_3_Public_Primary_Certification_Authority_2.crt +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/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 Added: ipcop/trunk/lfs/ca-certificates =================================================================== --- ipcop/trunk/lfs/ca-certificates (rev 0) +++ ipcop/trunk/lfs/ca-certificates 2014-04-09 11:42:43 UTC (rev 7443) @@ -0,0 +1,106 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard <r...@sunsetsystems.com> # +# # +# Modifications by: # +# ??-12-2003 Mark Wormgoor < m...@wormgoor.com> # +# - Modified Makefile for IPCop build # +# # +# $Id$ +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +PKG_NAME = ca-certificates +VER = 20140223 +HOST_ARCH = all +OTHER_SRC = yes + +THISAPP = $(PKG_NAME)-$(VER) +DL_FILE = $(PKG_NAME)_$(VER).tar.xz +DL_FROM = $(URL_DEBIAN)/c/$(PKG_NAME) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) + +CXXFLAGS += -Wall + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ff4049c32342ea450cda82bb14026ffd + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_SRC)/$(PKG_NAME) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) + + # Modify location for 'local' certificates + cd $(DIR_SRC)/$(PKG_NAME) && sed -i -e 's:LOCALCERTSDIR=.*:LOCALCERTSDIR=/var/ipcop/ca/ca-certificates:g' sbin/update-ca-certificates + # Remove Debian specific update hooks + cd $(DIR_SRC)/$(PKG_NAME) && patch -p1 -i $(DIR_PATCHES)/$(PKG_NAME)_remove-update-hooks.patch + # Progress messages from update-ca-certificates to logfile + cd $(DIR_SRC)/$(PKG_NAME) && patch -p1 -i $(DIR_PATCHES)/$(PKG_NAME)_add-logger.patch + + install -d -m 755 /etc/ssl/certs + install -d -m 755 /usr/share/ca-certificates + install -d -m 755 /var/ipcop/ca/ca-certificates + + cd $(DIR_SRC)/$(PKG_NAME) && make SUBDIRS=mozilla + cd $(DIR_SRC)/$(PKG_NAME) && make install SUBDIRS=mozilla + + echo "# Generated by ${THISAPP}" > /etc/ca-certificates.conf + echo "# " >> /etc/ca-certificates.conf + cd /usr/share/ca-certificates && find . -name '*.crt' | sort | cut -b3- >> /etc/ca-certificates.conf + + @rm -rf $(DIR_APP) + @$(POSTBUILD) Property changes on: ipcop/trunk/lfs/ca-certificates ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: ipcop/trunk/make.sh =================================================================== --- ipcop/trunk/make.sh 2014-04-08 19:09:31 UTC (rev 7442) +++ ipcop/trunk/make.sh 2014-04-09 11:42:43 UTC (rev 7443) @@ -1853,6 +1853,7 @@ chroot_make expat chroot_make bc # needed to run some openssl tests chroot_make openssl + chroot_make ca-certificates chroot_make libgpg-error # radiusplugin for OpenVPN chroot_make libgcrypt # radiusplugin for OpenVPN chroot_make libnet Added: ipcop/trunk/src/patches/ca-certificates_add-logger.patch =================================================================== --- ipcop/trunk/src/patches/ca-certificates_add-logger.patch (rev 0) +++ ipcop/trunk/src/patches/ca-certificates_add-logger.patch 2014-04-09 11:42:43 UTC (rev 7443) @@ -0,0 +1,20 @@ +Also output to logfile for later reading. + +--- a/sbin/update-ca-certificates 2014-04-07 08:57:09.616070707 +0200 ++++ b/sbin/update-ca-certificates 2014-04-07 08:59:24.000000000 +0200 +@@ -97,6 +97,7 @@ + test -f $symlink || rm -f $symlink + done + echo "done." ++ /usr/bin/logger -t ipcop "Cleared $ETCCERTSDIR" + fi + + echo -n "Updating certificates in $ETCCERTSDIR... " +@@ -148,6 +149,7 @@ + mv -f "$TEMPBUNDLE" "$CERTBUNDLE" + + echo "$ADDED_CNT added, $REMOVED_CNT removed; done." ++/usr/bin/logger -t ipcop "CA certificates bundle $ADDED_CNT added, $REMOVED_CNT removed" + + # vim:set et sw=2: + Added: ipcop/trunk/src/patches/ca-certificates_remove-update-hooks.patch =================================================================== --- ipcop/trunk/src/patches/ca-certificates_remove-update-hooks.patch (rev 0) +++ ipcop/trunk/src/patches/ca-certificates_remove-update-hooks.patch 2014-04-09 11:42:43 UTC (rev 7443) @@ -0,0 +1,21 @@ +Running hooks is very Debian specific. Does not work for us. + +--- a/sbin/update-ca-certificates 2014-04-07 08:57:09.616070707 +0200 ++++ b/sbin/update-ca-certificates 2014-04-07 08:59:24.000000000 +0200 +@@ -149,16 +149,5 @@ + + echo "$ADDED_CNT added, $REMOVED_CNT removed; done." + +-HOOKSDIR=/etc/ca-certificates/update.d +-echo -n "Running hooks in $HOOKSDIR...." +-VERBOSE_ARG= +-[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose +-eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook +-do +- ( cat $ADDED +- cat $REMOVED ) | $hook || echo E: $hook exited with code $?. +-done +-echo "done." +- + # vim:set et sw=2: + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Put Bad Developers to Shame Dominate Development with Jenkins Continuous Integration Continuously Automate Build, Test & Deployment Start a new project now. Try Jenkins in the cloud. http://p.sf.net/sfu/13600_Cloudbees _______________________________________________ Ipcop-svn mailing list Ipcop-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ipcop-svn