Mailinglist Archive: opensuse-commit (1082 mails)

< Previous Next >
commit rsync
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 08 May 2007 02:24:27 +0200
  • Message-id: <20070508002427.59678678168@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package rsync
checked in at Tue May 8 02:24:27 CEST 2007.

--------
--- rsync/rsync.changes 2007-04-18 22:25:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/rsync/rsync.changes    2007-05-07 23:35:27.000000000 +0200
@@ -1,0 +2,9 @@
+Mon May  7 23:34:40 CEST 2007 - dmueller@xxxxxxx
+
+- update to 2.6.9:
+  * several important bugfixes
+  * new features, see included NEWS file
+- build against system zlib instead of own zlib copy
+- build against system popt instead of own popt copy
+
+-------------------------------------------------------------------

Old:
----
  rsync-2.6.3-tzenv.diff
  rsync-2.6.8.tar.bz2
  rsync-tag-3.patch
  rsync-xattrs-fix.patch

New:
----
  rsync-2.6.9.tar.bz2
  slp.diff
  slp-fix.diff
  system-zlib.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rsync.spec ++++++
--- /var/tmp/diff_new_pack.m12498/_old  2007-05-08 02:23:36.000000000 +0200
+++ /var/tmp/diff_new_pack.m12498/_new  2007-05-08 02:23:36.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package rsync (Version 2.6.8)
+# spec file for package rsync (Version 2.6.9)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,12 +12,13 @@
 
 Name:           rsync
 BuildRequires:  libacl-devel libpng openslp-devel texlive-latex
+BuildRequires:  popt-devel zlib-devel
 License:        GNU General Public License (GPL)
 Group:          Productivity/Networking/Other
 PreReq:         %fillup_prereq %insserv_prereq
 Autoreqprov:    on
-Version:        2.6.8
-Release:        47
+Version:        2.6.9
+Release:        1
 Summary:        Replacement for RCP/mirror that has Many More Features
 Source:         samba.org/ftp/rsync/rsync-%{version}.tar.bz2
 Source1:        logrotate.rsync
@@ -25,9 +26,9 @@
 Source3:        rsyncd.rc
 Source4:        rsyncd.conf
 Source5:        rsyncd.secrets
-Patch:          rsync-2.6.3-tzenv.diff
-Patch1:         rsync-tag-3.patch
-Patch2:         rsync-xattrs-fix.patch
+Patch1:         slp-fix.diff
+Patch2:         slp.diff
+Patch3:         system-zlib.diff
 URL:            http://rsync.samba.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -51,15 +52,15 @@
 
 %prep
 %setup -q
-%patch2
+%patch3
 cp configure configure.orig
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
 cp configure.orig configure
-patch -p1 < patches/slp.diff
+#patch -p1 < patches/slp.diff
+%patch2 -p1
+%patch1
 cp configure.orig configure
-%patch -p1
-%patch1 -p1
 
 %build
 autoheader
@@ -67,6 +68,7 @@
 CFLAGS=$RPM_OPT_FLAGS \
     ./configure --prefix=/usr \
        --infodir=/usr/share/info \
+       --disable-debug \
        --mandir=%{_mandir} \
        --enable-slp \
        --enable-acl-support \
@@ -120,9 +122,15 @@
 /usr/bin/rsyncstats
 %doc %{_mandir}/man1/rsync.1.gz
 %doc %{_mandir}/man5/rsyncd.conf.5.gz
-%doc COPYING README tech_report.ps tech_report.tex
+%doc COPYING NEWS README tech_report.ps tech_report.tex
 
 %changelog
+* Mon May 07 2007 - dmueller@xxxxxxx
+- update to 2.6.9:
+  * several important bugfixes
+  * new features, see included NEWS file
+- build against system zlib instead of own zlib copy
+- build against system popt instead of own popt copy
 * Wed Apr 18 2007 - aj@xxxxxxx
 - Use texlive for building.
 * Tue Sep 12 2006 - ro@xxxxxxx


++++++ rsync-2.6.8.tar.bz2 -> rsync-2.6.9.tar.bz2 ++++++
++++ 49700 lines of diff (skipped)





++++++ slp.diff ++++++
++++ 926 lines (skipped)

++++++ slp-fix.diff ++++++
--- options.c
+++ options.c
@@ -245,8 +245,8 @@ static void print_rsync_version(enum log
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, %shard links, %ssymlinks,\n",
                (int) (sizeof (OFF_T) * 8), got_socketpair, hardlinks, links);
 
-       rprintf(f, "              batchfiles, %sinplace, %sIPv6, %sACLs, %sxattrs,\n",
-               have_inplace, ipv6, acls, xattrs);
+       rprintf(f, "              batchfiles, %sinplace, %sIPv6, %sACLs, %sxattrs, %sSLP\n",
+               have_inplace, ipv6, acls, xattrs, slp);
 
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
++++++ system-zlib.diff ++++++
--- Makefile.in
+++ Makefile.in
@@ -41,7 +41,8 @@ OBJS3=progress.o pipe.o
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o $(SLPOBJ)
 popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
-OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_POPT@
+LIBS += -lz
 
 TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread