Skip to content

Commit

Permalink
Added deb package build configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
twojstaryzdomu committed Feb 26, 2022
1 parent bfde6b3 commit 6cb9b63
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 0 deletions.
1 change: 1 addition & 0 deletions debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11
16 changes: 16 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Source: rsync
Section: unknown
Priority: optional
Maintainer: unknown <pi@>
Build-Depends: debhelper (>= 11)
Standards-Version: 4.1.3
Homepage: https://github.com/twojstaryzdomu/rsync
Vcs-Git: https://github.com/twojstaryzdomu/rsync.git
Vcs-Browser: https://github.com/twojstaryzdomu/rsync


Package: rsync
Section: unknown
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: rsync description
11 changes: 11 additions & 0 deletions debian/patches/00_liblz4_install.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -100,7 +100,7 @@ like.
> sudo apt install -y attr libattr1-dev
> sudo apt install -y libxxhash-dev
> sudo apt install -y libzstd-dev
- > sudo apt install -y libzlz4-dev
+ > sudo apt install -y liblz4-dev
> sudo apt install -y libssl-dev

- For CentOS (use EPEL for python3-pip):
41 changes: 41 additions & 0 deletions debian/patches/disable_reconfigure_req.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Description: Remove need to run reconfigure target
Author: Samuel Henrique <[email protected]>
Forwarded: not-needed
Index: rsync/Makefile.in
===================================================================
--- rsync.orig/Makefile.in
+++ rsync/Makefile.in
@@ -193,15 +193,6 @@ configure.sh config.h.in: configure.ac a
else \
echo "config.h.in has CHANGED."; \
fi
- @if test -f configure.sh.old -o -f config.h.in.old; then \
- if test "$(MAKECMDGOALS)" = reconfigure; then \
- echo 'Continuing with "make reconfigure".'; \
- else \
- echo 'You may need to run:'; \
- echo ' make reconfigure'; \
- exit 1; \
- fi \
- fi

.PHONY: reconfigure
reconfigure: configure.sh
@@ -215,17 +206,6 @@ restatus:
Makefile: Makefile.in config.status configure.sh config.h.in
@if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
@./config.status
- @if diff Makefile Makefile.old >/dev/null 2>&1; then \
- echo "Makefile is unchanged."; \
- rm Makefile.old; \
- else \
- if test "$(MAKECMDGOALS)" = reconfigure; then \
- echo 'Continuing with "make reconfigure".'; \
- else \
- echo "Makefile updated -- rerun your make command."; \
- exit 1; \
- fi \
- fi

stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile
sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf
1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
00_liblz4_install.patch disable_reconfigure_req.diff
3 changes: 3 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/make -f
%:
dh $@
3 changes: 3 additions & 0 deletions debian/watch
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version=4
opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/rsync-$1\.tar\.gz/ \
https://github.com/twojstaryzdomu/rsync/releases .*/v?(\d\S+)\.tar\.gz
10 changes: 10 additions & 0 deletions options.c
Original file line number Diff line number Diff line change
Expand Up @@ -1377,6 +1377,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
* only special cases are returned and listed here. */

switch (opt) {
case 'L':
if(update_links && copy_links) {
rprintf(FERROR, "L/--copy-links conflicts with --update-links.\n");
exit_cleanup(RERR_SYNTAX);
}
else {
snprintf(err_buf, sizeof err_buf, "update_links: %d\n", update_links);
snprintf(err_buf, sizeof err_buf, "copy_links: %d\n", copy_links);
}

case 'V':
version_opt_cnt++;
break;
Expand Down

0 comments on commit 6cb9b63

Please sign in to comment.