Backout botched "rsync" update.diff -r1.70 -r1.71 pkgsrc/net/rsync/Makefile
(tron)
@@ -1,56 +1,34 @@ | @@ -1,56 +1,34 @@ | |||
1 | # $NetBSD: Makefile,v 1.70 2008/03/09 20:56:57 bjs Exp $ | 1 | # $NetBSD: Makefile,v 1.71 2008/03/11 10:16:42 tron Exp $ | |
2 | 2 | |||
3 | DISTNAME= rsync-3.0.0 | 3 | DISTNAME= rsync-2.6.9 | |
4 | CATEGORIES= net | 4 | CATEGORIES= net | |
5 | PKGREVISION= 1 | |||
5 | MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \ | 6 | MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \ | |
6 | http://rsync.samba.org/ftp/rsync/old-versions/ \ | 7 | http://rsync.samba.org/ftp/rsync/old-versions/ \ | |
7 | ftp://ftp.sunet.se/pub/unix/admin/rsync/ \ | 8 | ftp://ftp.sunet.se/pub/unix/admin/rsync/ \ | |
8 | ftp://ftp.fu-berlin.de/unix/network/rsync/ | 9 | ftp://ftp.fu-berlin.de/unix/network/rsync/ | |
9 | 10 | |||
10 | MAINTAINER= tron@NetBSD.org | 11 | MAINTAINER= tron@NetBSD.org | |
11 | HOMEPAGE= http://rsync.samba.org/ | 12 | HOMEPAGE= http://rsync.samba.org/ | |
12 | COMMENT= Network file distribution/synchronisation utility | 13 | COMMENT= Network file distribution/synchronisation utility | |
13 | 14 | |||
14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 15 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
15 | PKG_DESTDIR_SUPPORT= user-destdir | 16 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 17 | |||
18 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync | |||
19 | ||||
17 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes | |
21 | CONFIGURE_ARGS+= --with-included-popt \ | |||
22 | --with-rsyncd-conf=${PKG_SYSCONFDIR}/rsyncd.conf | |||
18 | TEST_TARGET= test | 23 | TEST_TARGET= test | |
19 | USE_LIBTOOL= yes | |||
20 | ||||
21 | CONFIGURE_ARGS+= --with-included-popt | |||
22 | CONFIGURE_ARGS+= --with-rsyncd-conf=${${PKG_SYSCONFDIR}/rsyncd.conf:L:Q} | |||
23 | CONFIGURE_SCRIPT= configure.sh | |||
24 | 24 | |||
25 | CONF_FILES= ${EGDIR}/rsyncd.conf ${PKG_SYSCONFDIR}/rsyncd.conf | |||
26 | EGDIR= ${PREFIX}/share/examples/${PKGBASE} | |||
27 | PKG_SYSCONFSUBDIR= rsync | 25 | PKG_SYSCONFSUBDIR= rsync | |
28 | 26 | |||
29 | SUBST_CLASSES+= paths | 27 | SUBST_CLASSES+= paths | |
30 | SUBST_MESSAGE.paths= Fixing hardcoded paths. | 28 | SUBST_MESSAGE.paths= Fixing hardcoded paths. | |
31 | SUBST_STAGE.paths= post-patch | 29 | SUBST_STAGE.paths= post-patch | |
32 | SUBST_FILES.paths= ${WRKDIR}/rsyncd.conf rsync.1 rsyncd.conf.5 | 30 | SUBST_FILES.paths= rsync.h rsync.1 rsyncd.conf.5 | |
33 | SUBST_SED.paths= -e 's|/etc/rsyncd|${PKG_SYSCONFDIR}/rsyncd|g' | 31 | SUBST_SED.paths= -e 's|/etc/rsyncd|${PKG_SYSCONFDIR}/rsyncd|g' \ | |
34 | SUBST_SED.paths+= -e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g' | 32 | -e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g' | |
35 | SUBST_VARS.paths= VARBASE | |||
36 | ||||
37 | .PHONY: install-examples | |||
38 | install-examples: | |||
39 | ${RUN} \ | |||
40 | ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} && \ | |||
41 | ${INSTALL_DATA} ${WRKDIR}/rsyncd.conf ${DESTDIR}${EGDIR} | |||
42 | post-extract: | |||
43 | ${RUN} \ | |||
44 | ${CP} ${FILESDIR}/rsyncd.conf ${WRKDIR} | |||
45 | post-install: install-examples | |||
46 | ${RUN} \ | |||
47 | ${INSTALL_DATA_DIR} \ | |||
48 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} && \ | |||
49 | ${INSTALL_DATA} ${WRKSRC}/tech_report.tex \ | |||
50 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} && \ | |||
51 | ${INSTALL_DATA} ${WRKSRC}/README \ | |||
52 | ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} | |||
53 | 33 | |||
54 | .include "options.mk" | |||
55 | .include "../../converters/libiconv/buildlink3.mk" | |||
56 | .include "../../mk/bsd.pkg.mk" | 34 | .include "../../mk/bsd.pkg.mk" |
@@ -1,9 +1,7 @@ | @@ -1,9 +1,7 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2008/03/09 20:56:57 bjs Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2008/03/11 10:16:43 tron Exp $ | |
2 | bin/rsync | 2 | bin/rsync | |
3 | man/man1/rsync.1 | 3 | man/man1/rsync.1 | |
4 | man/man5/rsyncd.conf.5 | 4 | man/man5/rsyncd.conf.5 | |
5 | share/doc/rsync/README | 5 | share/doc/rsync/README | |
6 | share/doc/rsync/tech_report.tex | 6 | share/doc/rsync/tech_report.tex | |
7 | share/examples/rsync/rsyncd.conf | |||
8 | @dirrm share/examples/rsync | |||
9 | @dirrm share/doc/rsync | 7 | @dirrm share/doc/rsync |
@@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | |||
1 | # $NetBSD: hacks.mk,v 1.3 2008/03/09 20:56:57 bjs Exp $ | 1 | # $NetBSD: hacks.mk,v 1.4 2008/03/11 10:16:43 tron Exp $ | |
2 | 2 | |||
3 | ### [Tue Nov 21 19:32:00 UTC 2006 : tvierling] | 3 | ### [Tue Nov 21 19:32:00 UTC 2006 : tvierling] | |
4 | ### iconv(..., NULL, 0, NULL, 0) crashes in libc version of iconv(3) | 4 | ### iconv(..., NULL, 0, NULL, 0) crashes in libc version of iconv(3) | |
5 | ### | 5 | ### | |
6 | .if ${OPSYS} == "Interix" | 6 | .if ${OPSYS} == "Interix" | |
7 | PKG_HACKS+= pkgsrc-iconv | 7 | PKG_HACKS+= pkgsrc-iconv | |
8 | USE_GNU_ICONV= yes | 8 | .include "../../converters/libiconv/buildlink3.mk" | |
9 | .endif | 9 | .endif |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.27 2008/03/09 20:56:57 bjs Exp $ | 1 | $NetBSD: distinfo,v 1.28 2008/03/11 10:16:43 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (rsync-3.0.0.tar.gz) = 8c5582ba2977cd4bf96add95226c64b949931eec | 3 | SHA1 (rsync-2.6.9.tar.gz) = 341618e230ea2e0e551d0ccf06f840d4f824c843 | |
4 | RMD160 (rsync-3.0.0.tar.gz) = ab71155c8329a195f2c194c2284546d4cae07a97 | 4 | RMD160 (rsync-2.6.9.tar.gz) = 36d270d9f01e9a8e808f426196796001bdd3d5d2 | |
5 | Size (rsync-3.0.0.tar.gz) = 757821 bytes | 5 | Size (rsync-2.6.9.tar.gz) = 811841 bytes | |
6 | SHA1 (patch-ab) = eb9a5227351ddf52c9fcb4fcaca1459f4d24357f | 6 | SHA1 (patch-aa) = f8193d10197d44f78d923b9c2e4809072d25e988 | |
7 | SHA1 (patch-ab) = 1666dbc37c04c219886b2e5d160792e9b9e2b97d |
$NetBSD: patch-aa,v 1.13 2008/03/11 10:16:43 tron Exp $
--- sender.c.orig 2006-09-20 02:53:32.000000000 +0100
+++ sender.c 2007-08-23 14:43:38.000000000 +0100
@@ -123,6 +123,7 @@
char fname[MAXPATHLEN];
struct file_struct *file;
unsigned int offset;
+ size_t l = 0;
if (ndx < 0 || ndx >= the_file_list->count)
return;
@@ -133,6 +134,20 @@
file->dir.root, "/", NULL);
} else
offset = 0;
+
+ l = offset + 1;
+ if (file) {
+ if (file->dirname)
+ l += strlen(file->dirname);
+ if (file->basename)
+ l += strlen(file->basename);
+ }
+
+ if (l >= sizeof(fname)) {
+ rprintf(FERROR, "Overlong pathname\n");
+ exit_cleanup(RERR_FILESELECT);
+ }
+
f_name(file, fname + offset);
if (remove_source_files) {
if (do_unlink(fname) == 0) {
@@ -224,6 +239,7 @@
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int i, j;
+ size_t l = 0;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
@@ -259,6 +275,20 @@
fname[offset++] = '/';
} else
offset = 0;
+
+ l = offset + 1;
+ if (file) {
+ if (file->dirname)
+ l += strlen(file->dirname);
+ if (file->basename)
+ l += strlen(file->basename);
+ }
+
+ if (l >= sizeof(fname)) {
+ rprintf(FERROR, "Overlong pathname\n");
+ exit_cleanup(RERR_FILESELECT);
+ }
+
fname2 = f_name(file, fname + offset);
if (verbose > 2)
@@ -1,97 +1,22 @@ | @@ -1,97 +1,22 @@ | |||
1 | $NetBSD: patch-ab,v 1.11 2008/03/09 20:56:57 bjs Exp $ | 1 | $NetBSD: patch-ab,v 1.12 2008/03/11 10:16:43 tron Exp $ | |
2 | 2 | |||
3 | --- Makefile.in.orig 2008-02-12 20:29:09.000000000 -0500 | 3 | --- Makefile.in.orig 2004-08-12 14:59:03.000000000 -0400 | |
4 | +++ Makefile.in | 4 | +++ Makefile.in | |
5 | @@ -13,6 +13,7 @@ CFLAGS=@CFLAGS@ | 5 | @@ -59,12 +59,11 @@ CHECK_OBJS=getgroups.o getfsdev.o t_stub | |
6 | CPPFLAGS=@CPPFLAGS@ | 6 | all: rsync$(EXEEXT) | |
7 | EXEEXT=@EXEEXT@ | |||
8 | LDFLAGS=@LDFLAGS@ | |||
9 | +LTCFLAGS?= -prefer-pic | |||
10 | ||||
11 | INSTALLCMD=@INSTALL@ | |||
12 | INSTALLMAN=@INSTALL@ | |||
13 | @@ -54,26 +55,27 @@ CHECK_SYMLINKS = testsuite/chown-fake.te | |||
14 | CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o wildtest.o | |||
15 | ||||
16 | # note that the -I. is needed to handle config.h when using VPATH | |||
17 | +LTOBJ_SAVE= $(OBJ_RESTORE:%.o.sav=%.lo.sav) | |||
18 | +LTOBJ_RESTORE= $(OBJ_SAVE:.o=.lo) | |||
19 | .c.o: | |||
20 | @OBJ_SAVE@ | |||
21 | - $(CC) -I. -I$(srcdir) $(CFLAGS) $(CPPFLAGS) -c $< @CC_SHOBJ_FLAG@ | |||
22 | -@OBJ_RESTORE@ | |||
23 | + $(LIBTOOL) --mode=compile --tag=CC $(CC) -I. -I$(srcdir) $(CFLAGS) $(LTCFLAGS) $(CPPFLAGS) -c $< -o $(@:.o=.lo) $(LTOBJ_RESTORE) | |||
24 | ||||
25 | all: conf_stop make_stop rsync$(EXEEXT) @MAKE_MAN@ | |||
26 | 7 | |||
27 | install: all | 8 | install: all | |
28 | - -mkdir -p ${DESTDIR}${bindir} | 9 | - -mkdir -p ${DESTDIR}${bindir} | |
29 | - ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir} | 10 | - ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir} | |
30 | - -mkdir -p ${DESTDIR}${mandir}/man1 | 11 | - -mkdir -p ${DESTDIR}${mandir}/man1 | |
31 | - -mkdir -p ${DESTDIR}${mandir}/man5 | 12 | - -mkdir -p ${DESTDIR}${mandir}/man5 | |
32 | - if test -f $(srcdir)/rsync.1; then ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1; fi | 13 | - ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1 | |
33 | - if test -f $(srcdir)/rsyncd.conf.5; then ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi | 14 | - ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5 | |
34 | + ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${bindir} | 15 | + ${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir} | |
35 | + ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} ${INSTALL_STRIP} rsync$(EXEEXT) ${DESTDIR}${bindir} | 16 | + ${BSD_INSTALL_MAN} $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1 | |
36 | + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${mandir}/man1 | 17 | + ${BSD_INSTALL_MAN} $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5 | |
37 | + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${mandir}/man5 | 18 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/rsync | |
38 | + if test -f $(srcdir)/rsync.1; then ${BSD_INSTALL_MAN} $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1; fi | 19 | + ${BSD_INSTALL_DATA} README tech_report.tex ${DESTDIR}${PREFIX}/share/doc/rsync | |
39 | + if test -f $(srcdir)/rsyncd.conf.5; then ${BSD_INSTALL_MAN} $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi | |||
40 | 20 | |||
41 | install-strip: | 21 | install-strip: | |
42 | $(MAKE) INSTALL_STRIP='-s' install | 22 | $(MAKE) INSTALL_STRIP='-s' install | |
43 | ||||
44 | rsync$(EXEEXT): $(OBJS) | |||
45 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) | |||
46 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS:.o=.lo) $(LIBS) | |||
47 | ||||
48 | $(OBJS): $(HEADERS) | |||
49 | $(CHECK_OBJS): $(HEADERS) | |||
50 | @@ -82,7 +84,7 @@ flist.o: rounding.h | |||
51 | ||||
52 | rounding.h: rounding.c rsync.h | |||
53 | @for r in 0 1 3; do \ | |||
54 | - if $(CC) $(CFLAGS) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/rounding.c >/dev/null 2>&1; then \ | |||
55 | + if $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/rounding.c >/dev/null 2>&1; then \ | |||
56 | echo "#define EXTRA_ROUNDING $$r" >rounding.h; \ | |||
57 | if test -f "$$HOME/build_farm/build_test.fns"; then \ | |||
58 | echo "EXTRA_ROUNDING is $$r" >&2; \ | |||
59 | @@ -97,21 +99,21 @@ rounding.h: rounding.c rsync.h | |||
60 | fi | |||
61 | ||||
62 | tls$(EXEEXT): $(TLS_OBJ) | |||
63 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) | |||
64 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ:.o=.lo) $(LIBS) | |||
65 | ||||
66 | getgroups$(EXEEXT): getgroups.o | |||
67 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS) | |||
68 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.lo $(LIBS) | |||
69 | ||||
70 | getfsdev$(EXEEXT): getfsdev.o | |||
71 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS) | |||
72 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.lo $(LIBS) | |||
73 | ||||
74 | TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib/snprintf.o | |||
75 | trimslash$(EXEEXT): $(TRIMSLASH_OBJ) | |||
76 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS) | |||
77 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ:.o=.lo) $(LIBS) | |||
78 | ||||
79 | T_UNSAFE_OBJ = t_unsafe.o syscall.o util.o t_stub.o lib/compat.o lib/snprintf.o | |||
80 | t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ) | |||
81 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS) | |||
82 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ:.o=.lo) $(LIBS) | |||
83 | ||||
84 | gen: conf proto.h man | |||
85 | ||||
86 | @@ -209,9 +211,10 @@ check: all $(CHECK_PROGS) $(CHECK_SYMLIN | |||
87 | check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS) | |||
88 | rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29 | |||
89 | ||||
90 | +LT_BUILD_POPT= $(BUILD_POPT:.o=.lo) | |||
91 | wildtest.o: wildtest.c lib/wildmatch.c rsync.h config.h | |||
92 | wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ | |||
93 | - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ $(LIBS) | |||
94 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.lo lib/compat.lo lib/snprintf.lo $(LT_BUILD_POPT) $(LIBS) | |||
95 | ||||
96 | testsuite/chown-fake.test: | |||
97 | ln -s chown.test $(srcdir)/testsuite/chown-fake.test |