[arch-commits] Commit in xdelta/repos (4 files)

Eric Bélanger eric at archlinux.org
Tue Apr 21 01:58:39 EDT 2009


    Date: Tuesday, April 21, 2009 @ 01:58:39
  Author: eric
Revision: 36358

Merged revisions 356,36357 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xdelta/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r36357 | eric | 2009-04-21 01:58:21 -0400 (Tue, 21 Apr 2009) | 2 lines
  
  upgpkg: xdelta 1.1.4-2
      Added license, FHS man pages, Removed old patches
........

Modified:
  xdelta/repos/extra-x86_64/	(properties)
  xdelta/repos/extra-x86_64/PKGBUILD
Deleted:
  xdelta/repos/extra-x86_64/020-xdelta-gcc4.patch
  xdelta/repos/extra-x86_64/021-xdelta-gcc4-suse.patch

----------------------------+
 020-xdelta-gcc4.patch      |  159 -------------------------------------------
 021-xdelta-gcc4-suse.patch |  141 --------------------------------------
 PKGBUILD                   |   21 +----
 3 files changed, 7 insertions(+), 314 deletions(-)


Property changes on: xdelta/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xdelta/trunk:1
   + /xdelta/trunk:1-36357

Deleted: extra-x86_64/020-xdelta-gcc4.patch
===================================================================
--- extra-x86_64/020-xdelta-gcc4.patch	2009-04-21 05:58:21 UTC (rev 36357)
+++ extra-x86_64/020-xdelta-gcc4.patch	2009-04-21 05:58:39 UTC (rev 36358)
@@ -1,159 +0,0 @@
-
-from RedHat/Fedora
-
---- 20050325/xdelta-1.1.3/xdmain.c.gcc4	2001-09-24 08:59:18.000000000 +0200
-+++ 20050325/xdelta-1.1.3/xdmain.c	2005-03-23 10:18:10.481723800 +0100
-@@ -64,7 +64,7 @@
- 
- #include "xdelta.h"
- 
--extern HandleFuncTable xd_handle_table;
-+static HandleFuncTable xd_handle_table;
- 
- #define XD_PAGE_SIZE (1<<20)
- 
-@@ -141,7 +141,7 @@ typedef struct {
-   gint16         to_name_len;
- 
-   guint32        header_space[HEADER_WORDS];
--  guint8         magic_buf[XDELTA_PREFIX_LEN];
-+  char           magic_buf[XDELTA_PREFIX_LEN];
- 
-   XdFileHandle      *patch_in;
- 
-@@ -1041,7 +1041,7 @@ xd_handle_name (XdFileHandle *fh)
- }
- 
- static gssize
--xd_handle_read (XdFileHandle *fh, guint8 *buf, gsize nbyte)
-+xd_handle_read (XdFileHandle *fh, char *buf, gsize nbyte)
- {
-   if (nbyte == 0)
-     return 0;
-@@ -1053,7 +1053,7 @@ xd_handle_read (XdFileHandle *fh, guint8
-     }
- 
-   if (!no_verify)
--    edsio_md5_update (&fh->ctx, buf, nbyte);
-+    edsio_md5_update (&fh->ctx, (guint8 *)buf, nbyte);
- 
-   fh->current_pos += nbyte;
- 
-@@ -1061,7 +1061,7 @@ xd_handle_read (XdFileHandle *fh, guint8
- }
- 
- static gboolean
--xd_handle_write (XdFileHandle *fh, const guint8 *buf, gsize nbyte)
-+xd_handle_write (XdFileHandle *fh, const char *buf, gsize nbyte)
- {
-   g_assert (fh->type == WRITE_TYPE);
- 
-@@ -1073,7 +1073,7 @@ xd_handle_write (XdFileHandle *fh, const
-     }
- 
-   if (! no_verify)
--    edsio_md5_update (&fh->ctx, buf, nbyte);
-+    edsio_md5_update (&fh->ctx, (guint8 *)buf, nbyte);
- 
-   if (! (*fh->out_write) (fh, buf, nbyte))
-     {
-@@ -1360,7 +1360,7 @@ xd_handle_copy (XdFileHandle *from, XdFi
- {
-   if (from->in)
-     {
--      guint8 buf[1024];
-+      char buf[1024];
- 
-       /*if (! xd_handle_set_pos (from, off))
- 	return FALSE;*/
-@@ -1408,7 +1408,7 @@ xd_handle_copy (XdFileHandle *from, XdFi
- 	  if (xd_handle_map_page (from, off_page, &from->copy_page) < 0)
- 	    return FALSE;
- 
--	  if (! xd_handle_write (to, from->copy_page + off_off, copy))
-+	  if (! xd_handle_write (to, (char *)from->copy_page + off_off, copy))
- 	    return FALSE;
- 
- 	  if (! xd_handle_unmap_page (from, off_page, &from->copy_page))
-@@ -1427,13 +1427,13 @@ xd_handle_putui (XdFileHandle *fh, guint
- {
-   guint32 hi = g_htonl (i);
- 
--  return xd_handle_write (fh, (guint8*)&hi, 4);
-+  return xd_handle_write (fh, (char *)&hi, 4);
- }
- 
- static gboolean
- xd_handle_getui (XdFileHandle *fh, guint32* i)
- {
--  if (xd_handle_read (fh, (guint8*)i, 4) != 4)
-+  if (xd_handle_read (fh, (char *)i, 4) != 4)
-     return FALSE;
- 
-   *i = g_ntohl (*i);
-@@ -1557,7 +1557,7 @@ delta_command (gint argc, gchar** argv)
- 
-   htonl_array (header_space, HEADER_WORDS);
- 
--  if (! xd_handle_write (out, (guint8*) header_space, HEADER_SPACE))
-+  if (! xd_handle_write (out, (char *) header_space, HEADER_SPACE))
-     return 2;
- 
-   if (! xd_handle_write (out, from_name, strlen (from_name)))
-@@ -1632,7 +1632,7 @@ process_patch (const char* name)
-   if (xd_handle_read (patch->patch_in, patch->magic_buf, XDELTA_PREFIX_LEN) != XDELTA_PREFIX_LEN)
-     return NULL;
- 
--  if (xd_handle_read (patch->patch_in, (guint8*) patch->header_space, HEADER_SPACE) != HEADER_SPACE)
-+  if (xd_handle_read (patch->patch_in, (char*) patch->header_space, HEADER_SPACE) != HEADER_SPACE)
-     return NULL;
- 
-   ntohl_array (patch->header_space, HEADER_WORDS);
-@@ -1700,7 +1700,7 @@ process_patch (const char* name)
- 
-   if (patch->has_trailer)
-     {
--      guint8 trailer_buf[XDELTA_PREFIX_LEN];
-+      char trailer_buf[XDELTA_PREFIX_LEN];
- 
-       if (xd_handle_read (patch->patch_in, trailer_buf, XDELTA_PREFIX_LEN) != XDELTA_PREFIX_LEN)
- 	return NULL;
---- 20050325/xdelta-1.1.3/libedsio/default.c.gcc4	2001-09-24 08:48:52.000000000 +0200
-+++ 20050325/xdelta-1.1.3/libedsio/default.c	2005-03-23 10:16:03.512026128 +0100
-@@ -84,7 +84,7 @@ sink_next_bool (SerialSink* sink, gboole
- static gboolean
- sink_next_string (SerialSink* sink, const char   *ptr)
- {
--  return sink->next_bytes (sink, ptr, strlen (ptr));
-+  return sink->next_bytes (sink, (const unsigned char*)ptr, strlen (ptr));
- }
- 
- static gboolean
-@@ -241,7 +241,7 @@ static gboolean
- source_next_string (SerialSource* source, const char **ptr)
- {
-   guint32 len;
--  guint8* buf;
-+  char *buf;
- 
-   if (! source->next_uint (source, &len))
-     return FALSE;
-@@ -253,7 +253,7 @@ source_next_string (SerialSource* source
- 
-   (*ptr) = buf;
- 
--  return source->source_read (source, buf, len);
-+  return source->source_read (source, (guint8 *)buf, len);
- }
- 
- static gboolean
-@@ -294,7 +294,7 @@ serializeio_source_alloc (SerialSource* 
- 
-       source->alloc_buf = source->alloc_buf_orig;
- 
--	  { long x = source->alloc_buf; ALIGN_8 (x); source->alloc_buf = x; }
-+	  { long x = (long)source->alloc_buf; ALIGN_8 (x); source->alloc_buf = (void*)x; }
- 
-     }
- 
-

Deleted: extra-x86_64/021-xdelta-gcc4-suse.patch
===================================================================
--- extra-x86_64/021-xdelta-gcc4-suse.patch	2009-04-21 05:58:21 UTC (rev 36357)
+++ extra-x86_64/021-xdelta-gcc4-suse.patch	2009-04-21 05:58:39 UTC (rev 36358)
@@ -1,141 +0,0 @@
-suse patches for xdelta (and for loki_patch.) apply on top of redhat patches.
-
-diff -urNp loki-20050820~suse~/xdelta-1.1.3/libedsio/default.c loki-20050820/xdelta-1.1.3/libedsio/default.c
---- loki-20050820~suse~/xdelta-1.1.3/libedsio/default.c	2005-08-22 01:31:29.000000000 +0300
-+++ loki-20050820/xdelta-1.1.3/libedsio/default.c	2005-08-22 01:46:02.000000000 +0300
-@@ -7,6 +7,7 @@
-  * Author: Josh MacDonald <jmacd at CS.Berkeley.EDU>
-  */
- 
-+#include <stdint.h>
- #include "edsio.h"
- 
- /* Default Sink methods
-@@ -148,6 +149,9 @@ source_type_default (SerialSource* sourc
-     {
-       if (! source->next_uint32 (source, &source->alloc_total))
- 	return ST_Error;
-+      /* Work around stupid assumption that sizeof(void*) is the same
-+	 everywhere. */
-+      source->alloc_total *= sizeof (void *);
-     }
- 
-   return x;
-@@ -294,7 +298,7 @@ serializeio_source_alloc (SerialSource* 
- 
-       source->alloc_buf = source->alloc_buf_orig;
- 
--	  { long x = (long)source->alloc_buf; ALIGN_8 (x); source->alloc_buf = (void*)x; }
-+	  { intptr_t x = (intptr_t) source->alloc_buf; ALIGN_8 (x); source->alloc_buf = (void *) x; }
- 
-     }
- 
-diff -urNp loki-20050820~suse~/xdelta-1.1.3/libedsio/edsio.c loki-20050820/xdelta-1.1.3/libedsio/edsio.c
---- loki-20050820~suse~/xdelta-1.1.3/libedsio/edsio.c	2001-09-24 09:48:52.000000000 +0300
-+++ loki-20050820/xdelta-1.1.3/libedsio/edsio.c	2005-08-22 01:31:13.000000000 +0300
-@@ -296,7 +296,7 @@ edsio_time_of_day (SerialGenericTime* se
-   struct timeval tv;
-   time_t t = time (NULL);
- 
--  if (t < 0)
-+  if (t == ((time_t)-1))
-     {
-       edsio_generate_errno_event (EC_EdsioTimeFailure);
-       goto bail;
-diff -urNp loki-20050820~suse~/xdelta-1.1.3/libedsio/edsiotest.c loki-20050820/xdelta-1.1.3/libedsio/edsiotest.c
---- loki-20050820~suse~/xdelta-1.1.3/libedsio/edsiotest.c	2001-06-12 06:16:41.000000000 +0300
-+++ loki-20050820/xdelta-1.1.3/libedsio/edsiotest.c	2005-08-22 01:48:27.000000000 +0300
-@@ -48,6 +48,7 @@ test2 ()
-   const char* str = "hello there";
-   const char* str2;
-   guint32 str2_len;
-+  const char ** str2_ptr = &str2;
- 
-   PropTest *pt = g_new0 (PropTest, 1);
- 
-@@ -63,12 +64,12 @@ test2 ()
- 
-   g_assert (proptest_isset_bytes (pt, prop));
- 
--  g_assert (proptest_get_bytes (pt, prop, (const guint8**) & str2, & str2_len) && str2_len == (strlen (str) + 1) && strcmp (str, str2) == 0);
-+  g_assert (proptest_get_bytes (pt, prop, (const guint8**) str2_ptr, & str2_len) && str2_len == (strlen (str) + 1) && strcmp (str, str2) == 0);
- 
-   /* kill the cache, to test persistence. */
-   pt->_edsio_property_table = NULL;
- 
--  g_assert (proptest_get_bytes (pt, prop, (const guint8**) & str2, & str2_len) && str2_len == (strlen (str) + 1) && strcmp (str, str2) == 0);
-+  g_assert (proptest_get_bytes (pt, prop, (const guint8**) str2_ptr, & str2_len) && str2_len == (strlen (str) + 1) && strcmp (str, str2) == 0);
- 
-   g_assert (proptest_unset_bytes (pt, prop));
- 
-diff -urNp loki-20050820~suse~/xdelta-1.1.3/libedsio/fh.c loki-20050820/xdelta-1.1.3/libedsio/fh.c
---- loki-20050820~suse~/xdelta-1.1.3/libedsio/fh.c	2001-06-12 06:16:41.000000000 +0300
-+++ loki-20050820/xdelta-1.1.3/libedsio/fh.c	2005-08-22 01:33:31.000000000 +0300
-@@ -92,6 +92,9 @@ handle_source_type (SerialSource* source
-     {
-       if (! ssource->fh->table->table_handle_getui (ssource->fh, &source->alloc_total))
- 	return ST_Error;
-+      /* Work around stupid assumption that sizeof(void*) is the same
-+	 everywhere. */
-+      source->alloc_total *= sizeof (void *);
-     }
- 
-   return x;
-diff -urNp loki-20050820~suse~/xdelta-1.1.3/xdelta.c loki-20050820/xdelta-1.1.3/xdelta.c
---- loki-20050820~suse~/xdelta-1.1.3/xdelta.c	2005-08-22 01:31:29.000000000 +0300
-+++ loki-20050820/xdelta-1.1.3/xdelta.c	2005-08-22 01:49:35.000000000 +0300
-@@ -1401,12 +1401,13 @@ xdp_control_read (XdeltaStream    *cont_
- {
-   SerialSource* src = handle_source (cont_in);
-   XdeltaControl* cont;
-+  XdeltaControl** cont_ptr = &cont;
-   SerialType type;
- 
-   if (! src)
-     return NULL;
- 
--  if (! serializeio_unserialize_generic_acceptable (src, ST_XdeltaControl | ST_Version0Control, & type, (void**) & cont))
-+  if (! serializeio_unserialize_generic_acceptable (src, ST_XdeltaControl | ST_Version0Control, & type, (void **) cont_ptr))
-     return NULL;
- 
-   if (type == ST_Version0Control)
-diff -urNp loki-20050820~suse~/xdelta-1.1.3/xdmain.c loki-20050820/xdelta-1.1.3/xdmain.c
---- loki-20050820~suse~/xdelta-1.1.3/xdmain.c	2005-08-22 01:31:29.000000000 +0300
-+++ loki-20050820/xdelta-1.1.3/xdmain.c	2005-08-22 01:44:23.000000000 +0300
-@@ -1048,7 +1048,7 @@ xd_handle_read (XdFileHandle *fh, char *
- 
-   if (! (fh->in_read) (fh, buf, nbyte)) /* This is suspicious */
-     {
--      xd_error ("read failed: %s\n", g_strerror (errno));
-+      xd_error ("read failed: %s\n", errno?g_strerror (errno):"Unexpected end of file");
-       return -1;
-     }
- 
-@@ -1210,7 +1210,7 @@ static gssize
- xd_handle_map_page (XdFileHandle *fh, guint pgno, const guint8** mem)
- {
-   LRU* lru;
--  guint to_map;
-+  gint to_map;
- 
- #ifdef DEBUG_MAP
-   g_print ("map %p:%d\n", fh, pgno);
-@@ -1284,7 +1284,7 @@ xd_handle_map_page (XdFileHandle *fh, gu
- 	      return -1;
- 	    }
- #else
--	  if (! (lru->buffer = mmap (NULL, to_map, PROT_READ, MAP_PRIVATE, fh->fd, pgno * XD_PAGE_SIZE)))
-+	  if ( (lru->buffer = mmap (NULL, to_map, PROT_READ, MAP_PRIVATE, fh->fd, pgno * XD_PAGE_SIZE)) == MAP_FAILED )
- 	    {
- 	      xd_error ("mmap failed: %s\n", g_strerror (errno));
- 	      return -1;
-@@ -1489,7 +1489,7 @@ delta_command (gint argc, gchar** argv)
-   XdeltaSource* src;
-   XdeltaControl* cont;
-   gboolean from_is_compressed = FALSE, to_is_compressed = FALSE;
--  guint32 control_offset, header_offset;
-+  gint32 control_offset, header_offset;
-   const char* from_name, *to_name;
-   guint32 header_space[HEADER_WORDS];
-   int fd;
-

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-21 05:58:21 UTC (rev 36357)
+++ extra-x86_64/PKGBUILD	2009-04-21 05:58:39 UTC (rev 36358)
@@ -4,26 +4,19 @@
 
 pkgname=xdelta
 pkgver=1.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Used to identify differences between files similar to rsync"
 arch=(i686 x86_64)
+url="http://sourceforge.net/projects/xdelta/"
+license=('GPL')
 depends=('glib' 'zlib')
+options=('!libtool')
 source=("http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-url="http://sourceforge.net/projects/xdelta/"
 md5sums=('1b896c01ebf0e353b7e3c3071b05f496')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-
-   #Arch64 fix
-if [ "$CARCH" == "x86_64" ]; then
-  rm config.guess config.sub
-  ln -s /usr/share/libtool/config.guess config.guess
-  ln -s /usr/share/libtool/config.sub config.sub
-fi
-  
-  ./configure --prefix=/usr
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  make DESTDIR=$pkgdir install || return 1
 }



More information about the arch-commits mailing list