head 1.5; access; symbols OPENPKG_E1_MP_HEAD:1.2 OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_2_STABLE:1.2.2.2 OPENPKG_E1_FP:1.2.2.2 OPENPKG_2_STABLE_MP:1.2 OPENPKG_2_STABLE_20061018:1.2.2.2 OPENPKG_2_STABLE:1.2.0.2; locks; strict; comment @# @; 1.5 date 2008.01.05.09.13.48; author rse; state Exp; branches; next 1.4; commitid u35FTPtuGwCyOcMs; 1.4 date 2007.12.30.11.48.39; author rse; state Exp; branches; next 1.3; commitid LsKdBRM4XNfDRrLs; 1.3 date 2007.05.15.06.00.27; author rse; state Exp; branches; next 1.2; commitid 45PsD3vgfyvyiZhs; 1.2 date 2006.03.05.09.01.51; author rse; state Exp; branches 1.2.2.1; next 1.1; commitid wtzgVhElYJ7HjYnr; 1.1 date 2006.02.21.09.54.35; author rse; state Exp; branches; next ; commitid plw4JlsY1hzHZqmr; 1.2.2.1 date 2006.03.05.09.01.51; author rse; state dead; branches; next 1.2.2.2; commitid iZxwRSmmWscPXUQr; 1.2.2.2 date 2006.10.16.14.58.08; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.5 log @fix xar_iter_new usage and declaration @ text @Index: include/xar.h.in --- include/xar.h.in.orig 2007-12-29 19:49:57 +0100 +++ include/xar.h.in 2008-01-05 10:12:25 +0100 @@@@ -138,7 +138,7 @@@@ int32_t xar_prop_create(xar_file_t f, const char *key, const char *value); int32_t xar_prop_get(xar_file_t f, const char *key, const char **value); -xar_iter_t xar_iter_new(); +xar_iter_t xar_iter_new(void); void xar_iter_free(xar_iter_t i); const char *xar_prop_first(xar_file_t f, xar_iter_t i); Index: lib/Makefile.inc.in --- lib/Makefile.inc.in.orig 2007-12-29 19:49:57 +0100 +++ lib/Makefile.inc.in 2008-01-05 10:12:25 +0100 @@@@ -24,32 +24,14 @@@@ # Libraries. librxar is created such that it's possible to run xar without # first installing libxar. +LIBRXAR_SNAME := librxar.a +LIBRXAR_LNAME := librxar.a.1 LIBXAR_LANAME := libxar.la LIBXAR_ANAME := libxar.a -ifeq (elf, @@abi@@) -LIBRXAR_SNAME := librxar.so.@@LIB_REV@@ -LIBRXAR_LNAME := librxar.so +LIBXAR_SNAME := libxar.a +LIBXAR_LNAME := libxar.a.1 LIBRXAR_L := @@objroot@@lib/$(LIBRXAR_LNAME) -LIBXAR_SNAME := libxar.so.@@LIB_REV@@ -LIBXAR_LNAME := libxar.so LIBXAR_L := @@objroot@@lib/$(LIBXAR_LNAME) -endif -ifeq (macho, @@abi@@) -LIBRXAR_SNAME := librxar.@@LIB_REV@@.dylib -LIBRXAR_LNAME := librxar.dylib -LIBRXAR_L := @@objroot@@lib/$(LIBRXAR_LNAME) -LIBXAR_SNAME := libxar.@@LIB_REV@@.dylib -LIBXAR_LNAME := libxar.dylib -LIBXAR_L := @@objroot@@lib/$(LIBXAR_LNAME) -endif -ifeq (aout, @@abi@@) -LIBRXAR_SNAME := librxar.so.@@LIB_REV@@.0 -LIBRXAR_LNAME := -LIBRXAR_L := -LIBXAR_SNAME := libxar.so.@@LIB_REV@@.0 -LIBXAR_LNAME := -LIBXAR_L := -endif LIBXAR_LA := @@objroot@@lib/$(LIBXAR_LANAME) LIBXAR_A := @@objroot@@lib/$(LIBXAR_ANAME) LIBRXAR_S := @@objroot@@lib/$(LIBRXAR_SNAME) @@@@ -133,15 +115,7 @@@@ # installing libxar. $(LIBRXAR_S) : $(LIBXAR_SRCS:@@srcroot@@%.c=@@objroot@@%.o) @@mkdir -p $(@@D) -ifeq (elf, @@abi@@) - $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@@ $+ @@LIBS@@ -endif -ifeq (macho, @@abi@@) - $(CC) -dynamiclib -compatibility_version @@LIB_REV@@ -current_version @@LIB_REV@@ -install_name @@abs_objroot@@$(LIBRXAR_S) -o $@@ $+ $(LDFLAGS) @@LIBS@@ -endif -ifeq (aout, @@abi@@) - $(CC) -shared -o $@@ $+ -endif + ar cvr $@@ $+ ifneq ($(words "" $(LIBRXAR_L)), 1) rm -f $(LIBRXAR_L) ln -s $(LIBRXAR_SNAME) $(LIBRXAR_L) @@@@ -149,15 +123,7 @@@@ $(LIBXAR_S) : $(LIBXAR_SRCS:@@srcroot@@%.c=@@objroot@@%.o) @@mkdir -p $(@@D) -ifeq (elf, @@abi@@) - $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@@ $+ @@LIBS@@ -endif -ifeq (macho, @@abi@@) - $(CC) -dynamiclib -compatibility_version @@LIB_REV@@ -current_version @@LIB_REV@@ -install_name $(LIBDIR)/$(LIBXAR_SNAME) -o $@@ $+ $(LDFLAGS) @@LIBS@@ -endif -ifeq (aout, @@abi@@) - $(CC) -shared -o $@@ $+ -endif + ar cvr $@@ $+ ifneq ($(words "" $(LIBXAR_L)), 1) rm -f $(LIBXAR_L) ln -s $(LIBXAR_SNAME) $(LIBXAR_L) Index: lib/filetree.c --- lib/filetree.c.orig 2007-12-29 19:49:57 +0100 +++ lib/filetree.c 2008-01-05 10:12:25 +0100 @@@@ -263,7 +263,7 @@@@ * Returns a newly allocated iterator for use on files, properties, or * attributes. */ -xar_iter_t xar_iter_new() { +xar_iter_t xar_iter_new(void) { xar_iter_t ret = malloc(sizeof(struct __xar_iter_t)); if(!ret) return NULL; Index: lib/stat.c --- lib/stat.c.orig 2007-12-29 19:49:57 +0100 +++ lib/stat.c 2008-01-05 10:12:25 +0100 @@@@ -724,7 +724,7 @@@@ if( errno == ENOENT ) { xar_iter_t i; const char *ptr; - i = xar_iter_new(x); + i = xar_iter_new(); for(ptr = xar_prop_first(tmpf, i); ptr; ptr = xar_prop_next(i)) { xar_iter_t a; const char *val = NULL; @@@@ -736,7 +736,7 @@@@ continue; xar_prop_set(f, ptr, val); - a = xar_iter_new(x); + a = xar_iter_new(); for(akey = xar_attr_first(tmpf, ptr, a); akey; akey = xar_attr_next(a)) { aval = xar_attr_get(tmpf, ptr, akey); xar_attr_set(f, ptr, akey, aval); @ 1.4 log @upgrading package: xar 1.5.1 -> 1.5.2 @ text @d1 12 d15 1 a15 1 +++ lib/Makefile.inc.in 2007-12-30 12:45:20 +0100 d87 33 @ 1.3 log @upgrading package: xar 1.4 -> 1.5 @ text @d2 3 a4 3 --- lib/Makefile.inc.in.orig 2007-05-11 04:51:24 +0200 +++ lib/Makefile.inc.in 2007-05-15 07:54:37 +0200 @@@@ -24,30 +24,12 @@@@ d8 4 d15 2 a16 2 +LIBRXAR_SNAME := librxar.a +LIBRXAR_LNAME := librxar.a.1 a19 2 +LIBXAR_SNAME := libxar.a +LIBXAR_LNAME := libxar.a.1 d38 2 d41 1 a41 3 LIBXAR_S := @@objroot@@lib/$(LIBXAR_SNAME) @@@@ -104,15 +86,7 @@@@ d58 1 a58 1 @@@@ -120,15 +94,7 @@@@ @ 1.2 log @upgrading package: xar 1.3 -> 1.4 @ text @d2 2 a3 2 --- lib/Makefile.inc.in.orig 2006-02-20 23:44:09 +0100 +++ lib/Makefile.inc.in 2006-03-05 09:55:05 +0100 a72 11 Index: lib/archive.c --- lib/archive.c.orig 2006-02-20 23:44:09 +0100 +++ lib/archive.c 2006-03-05 09:52:26 +0100 @@@@ -39,6 +39,7 @@@@ #include #include #include +#include #include #include /* for ntoh{l,s} */ #include /* for PRIu64 */ @ 1.2.2.1 log @file xar.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:58:07 +0000 @ text @d1 83 @ 1.2.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 83 Index: lib/Makefile.inc.in --- lib/Makefile.inc.in.orig 2006-02-20 23:44:09 +0100 +++ lib/Makefile.inc.in 2006-03-05 09:55:05 +0100 @@@@ -24,30 +24,12 @@@@ # Libraries. librxar is created such that it's possible to run xar without # first installing libxar. -ifeq (elf, @@abi@@) -LIBRXAR_SNAME := librxar.so.@@LIB_REV@@ -LIBRXAR_LNAME := librxar.so +LIBRXAR_SNAME := librxar.a +LIBRXAR_LNAME := librxar.a.1 LIBRXAR_L := @@objroot@@lib/$(LIBRXAR_LNAME) -LIBXAR_SNAME := libxar.so.@@LIB_REV@@ -LIBXAR_LNAME := libxar.so +LIBXAR_SNAME := libxar.a +LIBXAR_LNAME := libxar.a.1 LIBXAR_L := @@objroot@@lib/$(LIBXAR_LNAME) -endif -ifeq (macho, @@abi@@) -LIBRXAR_SNAME := librxar.@@LIB_REV@@.dylib -LIBRXAR_LNAME := librxar.dylib -LIBRXAR_L := @@objroot@@lib/$(LIBRXAR_LNAME) -LIBXAR_SNAME := libxar.@@LIB_REV@@.dylib -LIBXAR_LNAME := libxar.dylib -LIBXAR_L := @@objroot@@lib/$(LIBXAR_LNAME) -endif -ifeq (aout, @@abi@@) -LIBRXAR_SNAME := librxar.so.@@LIB_REV@@.0 -LIBRXAR_LNAME := -LIBRXAR_L := -LIBXAR_SNAME := libxar.so.@@LIB_REV@@.0 -LIBXAR_LNAME := -LIBXAR_L := -endif LIBRXAR_S := @@objroot@@lib/$(LIBRXAR_SNAME) LIBXAR_S := @@objroot@@lib/$(LIBXAR_SNAME) @@@@ -104,15 +86,7 @@@@ # installing libxar. $(LIBRXAR_S) : $(LIBXAR_SRCS:@@srcroot@@%.c=@@objroot@@%.o) @@mkdir -p $(@@D) -ifeq (elf, @@abi@@) - $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@@ $+ @@LIBS@@ -endif -ifeq (macho, @@abi@@) - $(CC) -dynamiclib -compatibility_version @@LIB_REV@@ -current_version @@LIB_REV@@ -install_name @@abs_objroot@@$(LIBRXAR_S) -o $@@ $+ $(LDFLAGS) @@LIBS@@ -endif -ifeq (aout, @@abi@@) - $(CC) -shared -o $@@ $+ -endif + ar cvr $@@ $+ ifneq ($(words "" $(LIBRXAR_L)), 1) rm -f $(LIBRXAR_L) ln -s $(LIBRXAR_SNAME) $(LIBRXAR_L) @@@@ -120,15 +94,7 @@@@ $(LIBXAR_S) : $(LIBXAR_SRCS:@@srcroot@@%.c=@@objroot@@%.o) @@mkdir -p $(@@D) -ifeq (elf, @@abi@@) - $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@@ $+ @@LIBS@@ -endif -ifeq (macho, @@abi@@) - $(CC) -dynamiclib -compatibility_version @@LIB_REV@@ -current_version @@LIB_REV@@ -install_name $(LIBDIR)/$(LIBXAR_SNAME) -o $@@ $+ $(LDFLAGS) @@LIBS@@ -endif -ifeq (aout, @@abi@@) - $(CC) -shared -o $@@ $+ -endif + ar cvr $@@ $+ ifneq ($(words "" $(LIBXAR_L)), 1) rm -f $(LIBXAR_L) ln -s $(LIBXAR_SNAME) $(LIBXAR_L) Index: lib/archive.c --- lib/archive.c.orig 2006-02-20 23:44:09 +0100 +++ lib/archive.c 2006-03-05 09:52:26 +0100 @@@@ -39,6 +39,7 @@@@ #include #include #include +#include #include #include /* for ntoh{l,s} */ #include /* for PRIu64 */ @ 1.1 log @new package: xar 1.3 (XML Format File Archiver) @ text @d2 2 a3 2 --- lib/Makefile.inc.in.orig 2005-10-11 22:46:32 +0200 +++ lib/Makefile.inc.in 2006-02-21 10:48:02 +0100 d44 1 a44 1 - $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@@ $+ d61 1 a61 1 - $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@@ $+ d74 3 a76 3 --- lib/archive.c.orig 2005-10-09 07:15:25 +0200 +++ lib/archive.c 2006-02-21 10:43:39 +0100 @@@@ -38,6 +38,7 @@@@ @