rename cacert-dot-org to ca-certificates-cacert and keep it on [libre] temporally because there is a Arch official package but on [testing] only, add cacert-dot-org in conflicts and replaces array of pacman package to begin use ca-certificates-cacert

6 files changed, 81 insertions, 50 deletions

diff --git a/libre/ca-certificates-cacert/LICENSE b/libre/ca-certificates-cacert/LICENSE
new file mode 100644
index 000000000..d62429ca6
--- /dev/null
+++ b/libre/ca-certificates-cacert/LICENSE
@@ -0,0 +1,34 @@
+Root Distribution License
+
+1. Terms
+
+"CAcert Inc" means CAcert Incorporated, a non-profit association incorporated in New South Wales, Australia.
+"CAcert Community Agreement" means the agreement entered into by each person wishing to RELY.
+"Member" means a natural or legal person who has agreed to the CAcert Community Agreement.
+"Certificate" means any certificate or like device to which CAcert Inc's digital signature has been affixed.
+"CAcert Root Certificates" means any certificate issued by CAcert Inc to itself for the purposes of signing further CAcert Roots or for signing certificates of Members.
+"RELY" means the human act in taking on a risk or liability on the basis of the claim(s) bound within a certificate issued by CAcert.
+"Embedded" means a certificate that is contained within a software application or hardware system, when and only when, that software application or system is distributed in binary form only.
+
+2. Copyright
+
+CAcert Root Certificates are Copyright CAcert Incorporated. All rights reserved.
+
+3. License
+
+You may copy and distribute CAcert Root Certificates only in accordance with this license.
+
+CAcert Inc grants you a free, non-exclusive license to copy and distribute CAcert Root Certificates in any medium, with or without modification, provided that the following conditions are met:
+
+ - Redistributions of Embedded CAcert Root Certificates must take reasonable steps to inform the recipient of the disclaimer in section 4 or reproduce this license and copyright notice in full in the documentation provided with the distribution.
+ - Redistributions in all other forms must reproduce this license and copyright notice in full. 
+
+4. Disclaimer
+
+THE CACERT ROOT CERTIFICATES ARE PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED TO THE MAXIMUM EXTENT PERMITTED BY LAW. IN NO EVENT SHALL CACERT INC, ITS MEMBERS, AGENTS, SUBSIDIARIES OR RELATED PARTIES BE LIABLE TO THE LICENSEE OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THESE CERTIFICATES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. IN ANY EVENT, CACERT'S LIABILITY SHALL NOT EXCEED $1,000.00 AUSTRALIAN DOLLARS.
+
+THIS LICENSE SPECIFICALLY DOES NOT PERMIT YOU TO RELY UPON ANY CERTIFICATES ISSUED BY CACERT INC. IF YOU WISH TO RELY ON CERTIFICATES ISSUED BY CACERT INC, YOU MUST ENTER INTO A SEPARATE AGREEMENT WITH CACERT INC.
+
+5. Statutory Rights
+
+Nothing in this license affects any statutory rights that cannot be waived or limited by contract. In the event that any provision of this license is held to be invalid or unenforceable, the remaining provisions of this license remain in full force and effect. 
diff --git a/libre/ca-certificates-cacert/PKGBUILD b/libre/ca-certificates-cacert/PKGBUILD
new file mode 100644
index 000000000..709875cca
--- /dev/null
+++ b/libre/ca-certificates-cacert/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 220625 2014-08-24 14:47:59Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=ca-certificates-cacert
+pkgver=20140824
+pkgrel=0.1.parabola1 # build with 0.1 temporally because Arch official package is available on [testing] only
+pkgdesc="CAcert.org root certificates"
+arch=(any)
+url="https://www.cacert.org/index.php?id=3"
+license=('custom:RDL')
+depends=(ca-certificates-utils)
+install=ca-certificates-cacert.install
+source=(CAcert.org_root.crt::http://www.cacert.org/certs/root.crt
+        CAcert.org_class3.crt::http://www.cacert.org/certs/class3.crt
+        LICENSE)
+sha256sums=('c0e0773a79dceb622ef6410577c19c1e177fb2eb9c623a49340de3c9f1de2560'
+            'f5badaa5da1cc05b110a9492455a2c2790d00c7175dcf3a7bcb5441af71bf84f'
+            '2d9007a467e72d437ecfa13cc605c371e98a469f1aac4c890be74f953559833c')
+
+build() {
+  printf "cacert/%s\n" *.crt > cacert.conf
+}
+
+package() {
+  local _certdir="$pkgdir/usr/share/ca-certificates/cacert"
+  install -d "$_certdir"
+  install -t "$_certdir" -m644 *.crt
+
+  install -Dm644 cacert.conf "$pkgdir/etc/ca-certificates/conf.d/cacert.conf"
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/libre/ca-certificates-cacert/ca-certificates-cacert.install b/libre/ca-certificates-cacert/ca-certificates-cacert.install
new file mode 100644
index 000000000..0edbb0d72
--- /dev/null
+++ b/libre/ca-certificates-cacert/ca-certificates-cacert.install
@@ -0,0 +1,11 @@
+post_install() {
+  usr/bin/update-ca-certificates --fresh &>/dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  post_install
+}
diff --git a/libre/cacert-dot-org/PKGBUILD b/libre/cacert-dot-org/PKGBUILD
deleted file mode 100644
index c55ddf9a4..000000000
--- a/libre/cacert-dot-org/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer (Arch): Prurigro
-# Contributor (Arch): Neal <neal.oakey-at-oakey-dev.de>
-
-pkgname=cacert-dot-org
-pkgver=20140223
-pkgrel=5
-pkgdesc='CAcert.org is a community-driven Certificate Authority that issues certificates to the public at large for free'
-arch=('any')
-url='http://www.cacert.org'
-license=('GPL')
-source=("http://www.cacert.org/certs/root.crt"
-        "http://www.cacert.org/certs/class3.crt")
-depends=('ca-certificates')
-install="${pkgname}.install"
-sha512sums=('7350f2604e9839f1c2d02926fd4299468ffe2c456ba57a396575cfbb5b2b91fa3cb0e049f6cf3e1406d02014e420e263d6b0c4a59c51d0f03a735bfaa56ec7cc'
-            '416ceb36aa399f5116c617d470545a04e56bba2282e18fa7c1cc68271d8ac2e7b5787c7ea0f759794351f6e1ad77c76301664db10587046b2b269b274098845c')
-package() {
-    [[ "$(openssl x509 -noout -fingerprint -in root.crt)" == "SHA1 Fingerprint=13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33" ]] && install -Dm644 root.crt "${pkgdir}/usr/share/ca-certificates/cacert.org/cacert.org_root.crt"
-    [[ "$(openssl verify -CAfile root.crt -verbose class3.crt)" == "class3.crt: OK" ]] && install -Dm644 class3.crt "${pkgdir}/usr/share/ca-certificates/cacert.org/cacert.org_class3.crt"
-}
diff --git a/libre/cacert-dot-org/cacert-dot-org.install b/libre/cacert-dot-org/cacert-dot-org.install
deleted file mode 100644
index eb11f6607..000000000
--- a/libre/cacert-dot-org/cacert-dot-org.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-    #UPDATE FILE NAMES IN ca-certificates.conf IF THEY'RE OUT OF DATE
-    [[ `grep -c "mozilla/cacert.org" /etc/ca-certificates.conf` -gt 0 ]] && sed -i 's/mozilla\/cacert\.org/cacert\.org\/cacert\.org/g' /etc/ca-certificates.conf
-    [[ `grep -c "cacert.org/cacert.org-" /etc/ca-certificates.conf` -gt 0 ]] && sed -i 's/cacert\.org\/cacert\.org-/cacert\.org\/cacert\.org_/g' /etc/ca-certificates.conf
-
-    #ADD THE CERTIFICATES TO ca-certificates.conf IF THEY'RE MISSING
-    [[ `grep -c "cacert.org/cacert.org_root.crt" /etc/ca-certificates.conf` -eq 0 ]] && echo "cacert.org/cacert.org_root.crt" >> /etc/ca-certificates.conf
-    [[ `grep -c "cacert.org/cacert.org_class3.crt" /etc/ca-certificates.conf` -eq 0 ]] && echo "cacert.org/cacert.org_class3.crt" >> /etc/ca-certificates.conf
-
-    #UPDATE THE CERTIFICATES BASED ON ca-certificates.conf
-    update-ca-certificates --fresh
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    grep -v "cacert.org" /etc/ca-certificates.conf > /dev/shm/ca-certificates.conf.tmp
-    if [[ -s /dev/shm/ca-certificates.conf.tmp ]]; then
-        mv /dev/shm/ca-certificates.conf.tmp /etc/ca-certificates.conf
-        update-ca-certificates --fresh
-    else
-        echo "An error occurred that prevented the cacert.org certificates from being removed from /etc/ca-certificates.conf, please remove them manually, then run update-ca-certificates --fresh"
-    fi
-}
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index be9d693ea..9c08c530a 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -6,20 +6,20 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=6.1.parabola1
+pkgrel=6.1.parabola2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base' 'base-devel')
 depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4'
-         'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'cacert-dot-org')
+         'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'ca-certificates-cacert')
 makedepends=('asciidoc') # build man pages
 checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
 provides=("$pkgname-contrib")
-conflicts=("$pkgname-contrib" "$pkgname-parabola")
-replaces=("$pkgname-contrib" "$pkgname-parabola")
+conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
+replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
 backup=('etc/pacman.conf' 'etc/makepkg.conf')
 options=('strip' 'debug')
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}