public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] rsync: Update to 3.2.1
Date: Sun, 28 Jun 2020 09:36:32 +0200	[thread overview]
Message-ID: <20200628073633.2368-2-matthias.fischer@ipfire.org> (raw)
In-Reply-To: <20200628073633.2368-1-matthias.fischer@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 2669 bytes --]

For details see:
https://download.samba.org/pub/rsync/NEWS#3.2.1

Although 3.2.2 is in "release testing", I decided to push this release now to get things running.

I activated zstd-support and added 'DEPS = zstd'. 

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 lfs/rsync | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lfs/rsync b/lfs/rsync
index 342de920b..46da6075b 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.3
+VER        = 3.2.1
 
 THISAPP    = rsync-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 11
+PAK_VER    = 12
 
-DEPS       =
+DEPS       = zstd
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1581a588fde9d89f6bc6201e8129afaf
+$(DL_FILE)_MD5 = d2d7f1c6b07a1434203a2a2406e0bddd
 
 install : $(TARGET)
 
@@ -77,11 +77,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
+
+	# Replace shebang in rsync-ssl
+	cd $(DIR_APP) && sed -i -e "s@^#!.*@#!/bin/bash@" rsync-ssl
+
+	cd $(DIR_APP) && ./configure \
+	--prefix=/usr \
+	--without-included-popt \
+	--without-included-zlib \
+	--disable-xxhash
+
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	#cd $(DIR_APP)/doc && docbook2html rsync.sgml
 	cd $(DIR_APP) && make install
-	#cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/rsync-$(VER) &&
-	#cd $(DIR_APP) && install -v -m644 doc/*.html /usr/share/doc/rsync-$(VER)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.18.0


  reply	other threads:[~2020-06-28  7:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-28  7:36 [PATCH 1/3] zstd 1.4.5: New package Matthias Fischer
2020-06-28  7:36 ` Matthias Fischer [this message]
2020-06-29  9:40   ` [PATCH 2/3] rsync: Update to 3.2.1 Michael Tremer
2020-06-28  7:36 ` [PATCH 3/3] popt: Update to 1.18 Matthias Fischer
2020-06-29  9:40   ` Michael Tremer
2020-06-29  9:40 ` [PATCH 1/3] zstd 1.4.5: New package Michael Tremer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200628073633.2368-2-matthias.fischer@ipfire.org \
    --to=matthias.fischer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox