From 8862efd37570407d43d6cf7ec1902fd9ec38a630 Mon Sep 17 00:00:00 2001 From: Dan Ziemba Date: Tue, 2 Dec 2014 18:54:41 -0500 Subject: [PATCH] cyphertite: Upgrade to 2.0.4 --- .SRCINFO | 8 +-- PKGBUILD | 22 +++---- cyphertite-2.0.2.patch | 138 ----------------------------------------- 3 files changed, 11 insertions(+), 157 deletions(-) delete mode 100644 cyphertite-2.0.2.patch diff --git a/.SRCINFO b/.SRCINFO index 6b70f3a7fe74..18749032c71e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = cyphertite-external-libs pkgdesc = A high-security scalable solution for online backups - pkgver = 2.0.2 + pkgver = 2.0.4 pkgrel = 1 url = https://opensource.conformal.com/wiki/cyphertite arch = i686 @@ -21,12 +21,10 @@ pkgbase = cyphertite-external-libs depends = sqlite>=3.0.0 provides = cyphertite conflicts = cyphertite - source = https://opensource.conformal.com/snapshots/cyphertite/cyphertite-2.0.0.tar.gz + source = https://opensource.conformal.com/snapshots/cyphertite/cyphertite-2.0.4.tar.gz source = cyphertite-dynamic-link.patch - source = cyphertite-2.0.2.patch - sha1sums = 91dc3ac37f6f9f0190c83d15d1e20785953a0783 + sha1sums = 95941fe3f1e18c7639405b0c0f16409b4ddab91a sha1sums = 2f90214c2827dd7e66bcffe7724d0415a2411822 - sha1sums = 447cdb8a9c0178e206d7f9992473d29e82c571bb pkgname = cyphertite-external-libs diff --git a/PKGBUILD b/PKGBUILD index f6957f1f4b7a..888053ca12f1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,10 +2,7 @@ _pkgbasename=cyphertite pkgname=$_pkgbasename-external-libs -pkgver=2.0.2 -# Upstream did not release the individual package for 2.0.2. Only changes were -# to some unused build scripts to require newer openssl and version bump. -_pkgsrcver=2.0.0 +pkgver=2.0.4 pkgrel=1 pkgdesc="A high-security scalable solution for online backups" arch=(i686 x86_64) @@ -29,21 +26,18 @@ makedepends=('libclens') conflicts=('cyphertite') provides=('cyphertite') -source=(https://opensource.conformal.com/snapshots/cyphertite/cyphertite-$_pkgsrcver.tar.gz - cyphertite-dynamic-link.patch - cyphertite-2.0.2.patch) -sha1sums=('91dc3ac37f6f9f0190c83d15d1e20785953a0783' - '2f90214c2827dd7e66bcffe7724d0415a2411822' - '447cdb8a9c0178e206d7f9992473d29e82c571bb') +source=(https://opensource.conformal.com/snapshots/cyphertite/cyphertite-$pkgver.tar.gz + cyphertite-dynamic-link.patch) +sha1sums=('95941fe3f1e18c7639405b0c0f16409b4ddab91a' + '2f90214c2827dd7e66bcffe7724d0415a2411822') prepare() { - cd "$_pkgbasename-$_pkgsrcver" + cd "$_pkgbasename-$pkgver" patch -u -p0 -i $srcdir/cyphertite-dynamic-link.patch - patch -u -p1 -i $srcdir/cyphertite-2.0.2.patch } build() { - cd "$_pkgbasename-$_pkgsrcver" + cd "$_pkgbasename-$pkgver" make LOCALBASE=/usr obj msg "Building ctutil..." @@ -57,7 +51,7 @@ build() { } package() { - cd "$_pkgbasename-$_pkgsrcver" + cd "$_pkgbasename-$pkgver" make -C cyphertite LOCALBASE=/usr DESTDIR="$pkgdir" install mkdir -p $pkgdir/usr/share/licenses/$_pkgbasename diff --git a/cyphertite-2.0.2.patch b/cyphertite-2.0.2.patch deleted file mode 100644 index c499b8ec8c1e..000000000000 --- a/cyphertite-2.0.2.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/CHANGES b/CHANGES -index 2d6d4e7..870b984 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -3,6 +3,12 @@ User visible changes for cyphertite - A high-security scalable solution for online backups - ============================================================================ - -+Changes in 2.0.2 (Mon Apr 07 2014) -+ - Update install scripts to use OpenSSL 1.0.1g -+ -+Changes in 2.0.1 (Wed Feb 26 2014) -+ - Sync with Windows -+ - Changes in 2.0.0 (Sat Jan 04 2014) - - Install ct_threads header, which is needed by ct_sockets - - Build support for Darwin -diff --git a/config/cyphertite.spec b/config/cyphertite.spec -index 3fa9b42..85a405d 100644 ---- a/config/cyphertite.spec -+++ b/config/cyphertite.spec -@@ -1,5 +1,5 @@ - %define name cyphertite --%define version 2.0.0 -+%define version 2.0.2 - %define release 1 - - %define libeventpkg libevent -@@ -58,6 +58,10 @@ rm -f $RPM_BUILD_ROOT/usr/lib/libcyphertite.a - /usr/bin/cyphertitefb - - %changelog -+* Mon Apr 07 2014 - davec 2.0.2-1 -+- Update install scripts to use OpenSSL 1.0.1g -+* Wed Feb 26 2014 - dhill 2.0.1-1 -+- Sync with Windows - * Sat Jan 04 2014 - dhill 2.0.0-1 - - Install ct_threads header, which is needed by ct_sockets - - Build support for Darwin -diff --git a/config/debian/changelog b/config/debian/changelog -index 1aa3269..28d8925 100644 ---- a/config/debian/changelog -+++ b/config/debian/changelog -@@ -1,3 +1,15 @@ -+cyphertite (2.0.2-1) unstable; urgency=low -+ -+ * Update install scripts to use OpenSSL 1.0.1g -+ -+ -- Conformal Systems Mon, 07 Apr 2014 17:25:31 -0500 -+ -+cyphertite (2.0.1-1) unstable; urgency=low -+ -+ * Sync with Windows -+ -+ -- Conformal Systems Wed, 26 Feb 2014 13:17:16 -0500 -+ - cyphertite (2.0.0-1) unstable; urgency=low - - * Install ct_threads header, which is needed by ct_sockets -diff --git a/config/freebsd/sysutils/cyphertite/Makefile b/config/freebsd/sysutils/cyphertite/Makefile -index d005648..3f8e549 100644 ---- a/config/freebsd/sysutils/cyphertite/Makefile -+++ b/config/freebsd/sysutils/cyphertite/Makefile -@@ -6,7 +6,7 @@ - # - - PORTNAME= cyphertite --PORTVERSION= 2.0.0 -+PORTVERSION= 2.0.2 - PORTREVISION?= - CATEGORIES= textproc - MASTER_SITES= https://opensource.conformal.com/snapshots/cyphertite/ \ -diff --git a/config/openbsd/sysutils/cyphertite/Makefile b/config/openbsd/sysutils/cyphertite/Makefile -index 33132a7..99c51d2 100644 ---- a/config/openbsd/sysutils/cyphertite/Makefile -+++ b/config/openbsd/sysutils/cyphertite/Makefile -@@ -2,7 +2,7 @@ - - COMMENT = tar-like secure remote deduplicating archiver - --DISTNAME = cyphertite-2.0.0 -+DISTNAME = cyphertite-2.0.2 - EPOCH= 1 - CATEGORIES = sysutils archivers security - -diff --git a/libcyphertite/ct_config.c b/libcyphertite/ct_config.c -index 22ac983..9960bc3 100644 ---- a/libcyphertite/ct_config.c -+++ b/libcyphertite/ct_config.c -@@ -501,8 +501,7 @@ ct_load_config(struct ct_config **config, char **configfile) - } - free(conf.ct_ctfile_cachedir); - conf.ct_ctfile_cachedir = strdup(ct_fullcachedir); -- /* XXX Wtf is this? */ -- if (ct_fullcachedir == NULL) { -+ if (conf.ct_ctfile_cachedir == NULL) { - errno = ENOMEM; - return (CTE_ERRNO); - } -diff --git a/libcyphertite/cyphertite.h b/libcyphertite/cyphertite.h -index dc4a5a5..d7f673a 100644 ---- a/libcyphertite/cyphertite.h -+++ b/libcyphertite/cyphertite.h -@@ -26,7 +26,7 @@ - - #define CT_VERSION_MAJOR 2 - #define CT_VERSION_MINOR 0 --#define CT_VERSION_PATCH 0 -+#define CT_VERSION_PATCH 2 - #define CT_VERSION CT_STR(CT_VERSION_MAJOR) "." \ - CT_STR(CT_VERSION_MINOR) "." \ - CT_STR(CT_VERSION_PATCH) -diff --git a/scripts/ct_git_install.sh b/scripts/ct_git_install.sh -index f202851..b4bc675 100755 ---- a/scripts/ct_git_install.sh -+++ b/scripts/ct_git_install.sh -@@ -156,7 +156,7 @@ ct_get_source() - - # download the openssl source tar if needed - if ! openssl ciphers | grep ECDSA >/dev/null 2>&1; then -- OPENSSL_PKG="openssl-1.0.1c" -+ OPENSSL_PKG="openssl-1.0.1g" - OPENSSL_TGZ="$OPENSSL_PKG.tar.gz" - OPENSSL_URL="https://www.cyphertite.com/snapshots/OpenSSL/$OPENSSL_TGZ" - if [ ! -d "$OPENSSL_PKG" ]; then -diff --git a/scripts/ct_install.sh b/scripts/ct_install.sh -index cc29d37..e271054 100755 ---- a/scripts/ct_install.sh -+++ b/scripts/ct_install.sh -@@ -122,7 +122,7 @@ ct_build_and_install() - { - # build and install openssl source with ECDSA base system package - # doesn't have it. -- pkg="openssl-1.0.1c" -+ pkg="openssl-1.0.1g" - if ! openssl ciphers | grep ECDSA >/dev/null 2>&1; then - echo "Building ==> $pkg" - cd "$pkg"