Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7644410d60793174a5b4bbfb8e4d38f65e8cd250)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7644410d60793174a5b4bbfb8e4d38f65e8cd250)
  • Date: Sat, 6 Apr 2019 13:35:01 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

disk/rdiff-backup/DETAILS | 2 -
disk/rdiff-backup/HISTORY | 5 ++++
disk/rdiff-backup/PRE_BUILD | 5 ++++
disk/rdiff-backup/rdiff-backup-1.3.3-librsync-1.0.0.patch | 16
++++++++++++++
libs/librsync/CONFIGURE | 1
libs/librsync/DEPENDS | 7 +++++-
libs/librsync/DETAILS | 8 +++----
libs/librsync/HISTORY | 4 +++
8 files changed, 42 insertions(+), 6 deletions(-)

New commits:
commit 7644410d60793174a5b4bbfb8e4d38f65e8cd250
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

disk/rdiff-backup: fix compilation with recent versions of librsync

commit 0273d24c477ca68f3923da13c9339db536a8788a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/librsync: version 2.0.2, security update

commit 3ac7740d298dc7f5d3eb2ba227635ada246ea418
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

disk/rdiff-backup: version 1.3.3

diff --git a/disk/rdiff-backup/DETAILS b/disk/rdiff-backup/DETAILS
index fcfbc2a..716d7a1 100755
--- a/disk/rdiff-backup/DETAILS
+++ b/disk/rdiff-backup/DETAILS
@@ -1,5 +1,5 @@
SPELL=rdiff-backup
- VERSION=1.2.8
+ VERSION=1.3.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://savannah.nongnu.org/download/${SPELL}/${SOURCE}
diff --git a/disk/rdiff-backup/HISTORY b/disk/rdiff-backup/HISTORY
index bae66aa..bcf56eb 100644
--- a/disk/rdiff-backup/HISTORY
+++ b/disk/rdiff-backup/HISTORY
@@ -1,3 +1,8 @@
+2019-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to 1.3.3
+ * PRE_BUILD, rdiff-backup-1.3.3-librsync-1.0.0.patch: add patch from
+ gentoo to fix compilation with recent versions of librsync
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* DCA52872.gpg: added gpg keyring
diff --git a/disk/rdiff-backup/PRE_BUILD b/disk/rdiff-backup/PRE_BUILD
new file mode 100755
index 0000000..4186806
--- /dev/null
+++ b/disk/rdiff-backup/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/rdiff-backup-1.3.3-librsync-1.0.0.patch"
+
diff --git a/disk/rdiff-backup/rdiff-backup-1.3.3-librsync-1.0.0.patch
b/disk/rdiff-backup/rdiff-backup-1.3.3-librsync-1.0.0.patch
new file mode 100644
index 0000000..16b97ab
--- /dev/null
+++ b/disk/rdiff-backup/rdiff-backup-1.3.3-librsync-1.0.0.patch
@@ -0,0 +1,16 @@
+--- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16
15:36:21.000000000 +0100
++++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0
2015-03-02 00:54:24.000000000 +0100
+@@ -59,8 +59,13 @@
+ if (sm == NULL) return NULL;
+ sm->x_attr = NULL;
+
++#ifdef RS_DEFAULT_STRONG_LEN
+ sm->sig_job = rs_sig_begin((size_t)blocklen,
+
(size_t)RS_DEFAULT_STRONG_LEN);
++#else
++ sm->sig_job = rs_sig_begin((size_t)blocklen,
++ (size_t)8,
RS_MD4_SIG_MAGIC);
++#endif
+ return (PyObject*)sm;
+ }
+
diff --git a/libs/librsync/CONFIGURE b/libs/librsync/CONFIGURE
new file mode 100755
index 0000000..90942b1
--- /dev/null
+++ b/libs/librsync/CONFIGURE
@@ -0,0 +1 @@
+. "${GRIMOIRE}/CMAKE_CONFIGURE"
diff --git a/libs/librsync/DEPENDS b/libs/librsync/DEPENDS
index a3980d8..154768e 100755
--- a/libs/librsync/DEPENDS
+++ b/libs/librsync/DEPENDS
@@ -1 +1,6 @@
-depends popt
+. "${GRIMOIRE}/CMAKE_DEPENDS" &&
+
+depends gcc &&
+depends popt &&
+depends bzip2 &&
+depends zlib
diff --git a/libs/librsync/DETAILS b/libs/librsync/DETAILS
index b46b1fc..7eabc40 100755
--- a/libs/librsync/DETAILS
+++ b/libs/librsync/DETAILS
@@ -1,9 +1,9 @@
+. "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=librsync
- VERSION=0.9.7
- PATCHLEVEL=1
+ VERSION=2.0.2
+ SECURITY_PATCH=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef
+
SOURCE_HASH=sha512:5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://librsync.sourceforge.net";
LICENSE[0]=GPL
diff --git a/libs/librsync/HISTORY b/libs/librsync/HISTORY
index 61703f7..fee1116 100644
--- a/libs/librsync/HISTORY
+++ b/libs/librsync/HISTORY
@@ -1,3 +1,7 @@
+2019-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.2, SECURITY_PATCH++, fixes CVE-2014-8242
+ * DEPENDS, CONFIGURE, DETAILS: use cmake
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7644410d60793174a5b4bbfb8e4d38f65e8cd250), Florian Franzmann, 04/06/2019

Archive powered by MHonArc 2.6.24.

Top of Page