From 0d86be6db1bb580fde6948b418655c7401200b98 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Sat, 15 Oct 2022 15:05:08 +0200 Subject: [PATCH] cas updated. refactor, repos, urls updated --- ca.pem | 23 +++++++++++++++++++++++ cacert.pem | 25 ------------------------- debian/changelog | 2 +- debian/compat | 2 +- debian/control | 8 ++++---- debian/copyright | 2 +- debian/install | 3 ++- debian/links | 3 ++- old-ca.pem | 26 ++++++++++++++++++++++++++ update-repo | 11 ++++++----- vn.list | 12 ++++++------ 11 files changed, 72 insertions(+), 45 deletions(-) create mode 100644 ca.pem delete mode 100755 cacert.pem create mode 100644 old-ca.pem diff --git a/ca.pem b/ca.pem new file mode 100644 index 0000000..50204e1 --- /dev/null +++ b/ca.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDvzCCAqegAwIBAgIUG3Pd897tVM9pYLpPJFsulfk1z9EwDQYJKoZIhvcNAQEL +BQAwaDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNwYWluMREwDwYDVQQHDAhWYWxl +bmNpYTEeMBwGA1UECgwVVmVyZG5hdHVyYSBMZXZhbnRlIFNMMRYwFAYDVQQDDA1W +ZXJkbmF0dXJhIENBMB4XDTIwMTEwNjEyNTE0NVoXDTQwMTEwMTEyNTE0NVowaDEL +MAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNwYWluMREwDwYDVQQHDAhWYWxlbmNpYTEe +MBwGA1UECgwVVmVyZG5hdHVyYSBMZXZhbnRlIFNMMRYwFAYDVQQDDA1WZXJkbmF0 +dXJhIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArKqvodZFH2RN +fSJ5tzNlxdcrSKl3iLF7ImeU/WlXXnUKxdsXFTq+HbychOc6fYOzTccvUxcgBz14 +j1ikqF98NLqEHy1vR5tfUGWLuNIQQ+aEaycuZupeCVNxo9LZ5L2HOJvBZdrhFE92 +op9BRNiNV4yqS+nkIvUyo4YJljUYAyVG5ZQAd5bEC5DXwehBaNkCcpIipWkYuFGh +3UpHd85FCcmEXXBuyMQhb7FYiqcK9yRfky10jf6K6JyxYBvHCnna5/rDFqQZthWU +CgIfIS090EEKkIBqUNsuLdhFSZGFXXBgVwslmAynoDF4CUddFrpyAhQmg5DND96W +EHbW4K+3vQIDAQABo2EwXzAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFD36Jl1/ +uks1Ai3Gzijjd00VkPQJMA0GCSqGSIb3DQEBCwUAA4IBAQCDovHrdChX5e6/wGrr +8g8Xs1j2Lph9tIVtbP+mm9tsIvd8GV2LZIxEiw9GKdSZcx0vivT8Y2dM2b8pjkUY +8a7/ByLhEhxSDKcMk0cHwfD4zdhKcQBVb7DIYmBXLaiKlGFG04407klCRomzU+5y +SEte8AsCGmz7MOkDQ2IjghF5iM+Cagktlya3u2uefXN4CF81VOJlm5nICrc1ltPM +RsqTl8uxrgNxvqlODxC5kMePMulcJF3ybmhZwNqjraV4HupuwphedpaUypUQTSxp +mcUbG0MFkFnVF812ZN8QvNdmnguJ8o5Fzb6PvtEDgnJpU9CPQaqqec5ILMjBETFz +U438 +-----END CERTIFICATE----- diff --git a/cacert.pem b/cacert.pem deleted file mode 100755 index f7bd939..0000000 --- a/cacert.pem +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEQzCCAyugAwIBAgIJAJimL+J4jUaQMA0GCSqGSIb3DQEBBQUAMIG2MQswCQYD -VQQGEwJFUzEdMBsGA1UECAwUQ29tdW5pZGFkIFZhbGVuY2lhbmExETAPBgNVBAcM -CFZhbGVuY2lhMR4wHAYDVQQKDBVWZXJkbmF0dXJhIExldmFudGUgU0wxFDASBgNV -BAsMC0luZm9ybWF0aWNhMRYwFAYDVQQDDA12ZXJkbmF0dXJhLmVzMScwJQYJKoZI -hvcNAQkBFhhob3N0bWFzdGVyQHZlcmRuYXR1cmEuZXMwIBcNMTMwNjExMTE1MjQ1 -WhgPMjA2MzA1MzAxMTUyNDVaMIG2MQswCQYDVQQGEwJFUzEdMBsGA1UECAwUQ29t -dW5pZGFkIFZhbGVuY2lhbmExETAPBgNVBAcMCFZhbGVuY2lhMR4wHAYDVQQKDBVW -ZXJkbmF0dXJhIExldmFudGUgU0wxFDASBgNVBAsMC0luZm9ybWF0aWNhMRYwFAYD -VQQDDA12ZXJkbmF0dXJhLmVzMScwJQYJKoZIhvcNAQkBFhhob3N0bWFzdGVyQHZl -cmRuYXR1cmEuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsqq+h -1kUfZE19Inm3M2XF1ytIqXeIsXsiZ5T9aVdedQrF2xcVOr4dvJyE5zp9g7NNxy9T -FyAHPXiPWKSoX3w0uoQfLW9Hm19QZYu40hBD5oRrJy5m6l4JU3Gj0tnkvYc4m8Fl -2uEUT3ain0FE2I1XjKpL6eQi9TKjhgmWNRgDJUbllAB3lsQLkNfB6EFo2QJykiKl -aRi4UaHdSkd3zkUJyYRdcG7IxCFvsViKpwr3JF+TLXSN/oronLFgG8cKedrn+sMW -pBm2FZQKAh8hLT3QQQqQgGpQ2y4t2EVJkYVdcGBXCyWYDKegMXgJR10WunICFCaD -kM0P3pYQdtbgr7e9AgMBAAGjUDBOMB0GA1UdDgQWBBQ9+iZdf7pLNQItxs4o43dN -FZD0CTAfBgNVHSMEGDAWgBQ9+iZdf7pLNQItxs4o43dNFZD0CTAMBgNVHRMEBTAD -AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAcFzJhm3jjuexZf9tTgQfzwtsafLLsYkrm -EZOTkhvZFJYbBd8UngL5UPF1M3buSEV1VqsWCALLrFkxzbmjk5uM8cswZR/3J6un -7GFYWTEllVgkD8KmNA2b6j5uSuGCQmOccsR4069vwNjrvTbtQpEpEAAnDf6d5/N4 -MXuDozHq3iEYi7qyGf++5mp4D+82y2ONSUsiLgxqnMT5JX/yhDKI1IiX1ndyt+6r -ie2i2fzdOgovlAILuTM4hoUjPYFOxwmUwpxU2EAjPqo9Bi7bQiH+fv0QBzbpQ9on -DRHo7NuXaDG49nvatJjuf4DiDELBCTMeKBOk5hG7kyWCIwp5wr+w ------END CERTIFICATE----- diff --git a/debian/changelog b/debian/changelog index 76251f2..7a379d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vn-host (1.004-deb8) stable; urgency=low +vn-host (2.1.1) stable; urgency=low * Initial Release. diff --git a/debian/compat b/debian/compat index f11c82a..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 \ No newline at end of file +10 diff --git a/debian/control b/debian/control index b0c7520..d2e0a30 100644 --- a/debian/control +++ b/debian/control @@ -4,13 +4,13 @@ Maintainer: Juan Ferrer Toribio Build-Depends: build-essential, debhelper Standards-Version: 3.9.3 Section: misc -Homepage: http://www.verdnatura.es -Vcs-Git: git://git.verdnatura.es/ +Homepage: https://verdnatura.es +Vcs-Git: https://gitea.verdnatura.es/ Package: vn-host Architecture: all Depends: gpgv Section: misc Priority: optional -Description: Public Verdnatura repositories and certificates - Public Verdnatura repositories and certificates. +Description: Verdnatura certificates + Public Verdnatura certificates and APT repository. diff --git a/debian/copyright b/debian/copyright index 1b430c9..6595295 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://dep.debian.net/deps/dep5 Name: vn-host -Source: git://git.verdnatura.es/ +Source: https://gitea.verdnatura.es/ Files: * Copyright: 2011-2015 Juan Ferrer Toribio diff --git a/debian/install b/debian/install index c2b5175..c7f0f91 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,5 @@ verdnatura.gpg etc/apt/trusted.gpg.d -cacert.pem usr/share/ca-certificates/verdnatura.es +ca.pem usr/share/ca-certificates/verdnatura.es +old-ca.pem usr/share/ca-certificates/verdnatura.es update-repo usr/sbin vn.list etc/apt/sources.list.d diff --git a/debian/links b/debian/links index c950169..9482bb8 100644 --- a/debian/links +++ b/debian/links @@ -1 +1,2 @@ -usr/share/ca-certificates/verdnatura.es/cacert.pem etc/ssl/certs/verdnatura.es.pem +usr/share/ca-certificates/verdnatura.es/ca.pem etc/ssl/certs/Verdnatura_CA.pem +usr/share/ca-certificates/verdnatura.es/old-ca.pem etc/ssl/certs/Verdnatura_CA_old.pem diff --git a/old-ca.pem b/old-ca.pem new file mode 100644 index 0000000..a1c6710 --- /dev/null +++ b/old-ca.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEXTCCA0WgAwIBAgIURUPRgeHoKVUN5MQywkR+C7+CXgkwDQYJKoZIhvcNAQEL +BQAwgbYxCzAJBgNVBAYTAkVTMR0wGwYDVQQIDBRDb211bmlkYWQgVmFsZW5jaWFu +YTERMA8GA1UEBwwIVmFsZW5jaWExHjAcBgNVBAoMFVZlcmRuYXR1cmEgTGV2YW50 +ZSBTTDEUMBIGA1UECwwLSW5mb3JtYXRpY2ExFjAUBgNVBAMMDXZlcmRuYXR1cmEu +ZXMxJzAlBgkqhkiG9w0BCQEWGGhvc3RtYXN0ZXJAdmVyZG5hdHVyYS5lczAeFw0y +MjA4MDMyMDI2NTlaFw00MjA3MjkyMDI2NTlaMIG2MQswCQYDVQQGEwJFUzEdMBsG +A1UECAwUQ29tdW5pZGFkIFZhbGVuY2lhbmExETAPBgNVBAcMCFZhbGVuY2lhMR4w +HAYDVQQKDBVWZXJkbmF0dXJhIExldmFudGUgU0wxFDASBgNVBAsMC0luZm9ybWF0 +aWNhMRYwFAYDVQQDDA12ZXJkbmF0dXJhLmVzMScwJQYJKoZIhvcNAQkBFhhob3N0 +bWFzdGVyQHZlcmRuYXR1cmEuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQCsqq+h1kUfZE19Inm3M2XF1ytIqXeIsXsiZ5T9aVdedQrF2xcVOr4dvJyE +5zp9g7NNxy9TFyAHPXiPWKSoX3w0uoQfLW9Hm19QZYu40hBD5oRrJy5m6l4JU3Gj +0tnkvYc4m8Fl2uEUT3ain0FE2I1XjKpL6eQi9TKjhgmWNRgDJUbllAB3lsQLkNfB +6EFo2QJykiKlaRi4UaHdSkd3zkUJyYRdcG7IxCFvsViKpwr3JF+TLXSN/oronLFg +G8cKedrn+sMWpBm2FZQKAh8hLT3QQQqQgGpQ2y4t2EVJkYVdcGBXCyWYDKegMXgJ +R10WunICFCaDkM0P3pYQdtbgr7e9AgMBAAGjYTBfMA4GA1UdDwEB/wQEAwIBhjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAd +BgNVHQ4EFgQUPfomXX+6SzUCLcbOKON3TRWQ9AkwDQYJKoZIhvcNAQELBQADggEB +AEoDI+hUiV+pWpmh188b0f47fdLw+Zh1/AfQUj6dnVM6oXPDBjgbuhV8GiL0YtZX +i+rmeelLunmeBg0nYjaeF31x0ZIwl0slDN8PFkcPzhAOYwv9QWWgHKBxIQrJ/Vtp +0xSsWmyxyw7Ax+pSEXOM9kSKMZQZOPpE/G9yoA0rMF80DgSHc2DBl2BBOFC+VPdE +j4JbK9iL8fpyRJccsRFy9OQ/0hhKUQyLhahz577o5ZX4IjxLxcfHKxrJGVJeVXYD +mRGOnabIeJQfTGviEdnkyH2DdLxi7y6aKMlPWnutRutcsyJS6hOGlhFsyGJVN6lU +umCc9ZVn7zD1QWO7GVY2qao= +-----END CERTIFICATE----- diff --git a/update-repo b/update-repo index 6c5f31b..bf9d056 100755 --- a/update-repo +++ b/update-repo @@ -1,15 +1,16 @@ #!/bin/bash -REPO_FILE=$1 +repoFile=$1 +scriptFile=$(basename $0) -if [ -z "$REPO_FILE" ] +if [ -z "$repoFile" ] then - echo "Usage: $0 repo_file" + echo "Usage: $scriptFile repo_file" exit 1 fi -apt-get update \ - -o Dir::Etc::sourcelist="sources.list.d/$REPO_FILE.list" \ +apt-get -qq update \ + -o Dir::Etc::sourcelist="sources.list.d/$repoFile.list" \ -o Dir::Etc::sourceparts="-" \ -o APT::Get::List-Cleanup="0" diff --git a/vn.list b/vn.list index 086910e..2077aa8 100644 --- a/vn.list +++ b/vn.list @@ -1,10 +1,10 @@ -deb http://apt.verdnatura.es/ wheezy main -deb-src http://apt.verdnatura.es/ wheezy main +deb http://apt.verdnatura.es/ testing main +deb-src http://apt.verdnatura.es/ testing main -deb http://apt.verdnatura.es/ jessie main -deb-src http://apt.verdnatura.es/ jessie main +deb http://apt.verdnatura.es/ stable main +deb-src http://apt.verdnatura.es/ stable main -deb http://apt.verdnatura.es/ stretch main -deb-src http://apt.verdnatura.es/ stretch main +deb http://apt.verdnatura.es/ oldstable main +deb-src http://apt.verdnatura.es/ oldstable main