[CVS] RPM: rpm/ CHANGES configure.ac macros.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Oct-2008 09:46:48
Branch: HEAD Handle: 2008101907464800
Modified files:
rpm CHANGES configure.ac macros.in
Log:
add buildrootdir macro, with configure option
Summary:
RevisionChanges Path
1.2619 +2 -0 rpm/CHANGES
2.318 +11 -0 rpm/configure.ac
1.258 +6 -4 rpm/macros.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2618 -r1.2619 CHANGES
--- rpm/CHANGES 18 Oct 2008 08:29:12 - 1.2618
+++ rpm/CHANGES 19 Oct 2008 07:46:48 - 1.2619
@@ -1,5 +1,7 @@
5.2a2 - 5.2a3:
+- afb: make buildroot path configurable, but keep old defaults
+- rpm.org: add %{_buildrootdir} macro for use with %{buildroot}
5.2a1 - 5.2a2:
- jbj: permit --whatconflicts/--whatobsoletes to be displayed with
--help.
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.317 -r2.318 configure.ac
--- rpm/configure.ac 14 Oct 2008 19:38:45 - 2.317
+++ rpm/configure.ac 19 Oct 2008 07:46:48 - 2.318
@@ -1498,6 +1498,17 @@
AC_MSG_RESULT([$MAGIC_MACRO])
AC_SUBST(MAGIC_MACRO)
+dnl # determine RPM buildroot directory path
+AC_MSG_CHECKING([for RPM buildroot directory])
+BUILDROOTDIR_MACRO=%{_tmppath}
+AC_ARG_WITH(
+[path-buildroot],
+AS_HELP_STRING([--with-path-buildroot=ARG], [build with RPM buildroot
path (or macro)]),
+[BUILDROOTDIR_MACRO=$withval]
+)
+AC_MSG_RESULT([$BUILDROOTDIR_MACRO])
+AC_SUBST(BUILDROOTDIR_MACRO)
+
dnl # determine RPM locale directory path
AC_MSG_CHECKING([for RPM locale directory])
LOCALEDIR=`echo ${usrprefix}/share/locale`
@@ .
patch -p0 '@@ .'
Index: rpm/macros.in
$ cvs diff -u -r1.257 -r1.258 macros.in
--- rpm/macros.in 15 Oct 2008 18:39:28 - 1.257
+++ rpm/macros.in 19 Oct 2008 07:46:48 - 1.258
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.257 2008/10/15 18:39:28 jbj Exp $
+# $Id: macros.in,v 1.258 2008/10/19 07:46:48 afb Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -242,6 +242,9 @@
#The directory where newly built source packages will be written.
%_srcrpmdir %{_topdir}/SRPMS
+#The directory where buildroots will be created.
+%_buildrootdir @BUILDROOTDIR_MACRO@
+
#Directory where temporaray files can be created.
%_tmppath%{_var}/tmp
%tmpdir %{_tmppath}
@@ -254,10 +257,9 @@
#Macros that are initialized as a side effect of spec
#file parsing.
#
-#Configurable build root path, same as BuildRoot: in a specfile.
-#(Note: the configured macro value will override the spec file value).
+#Build root path, where %install installs the package during build.
#
-%buildroot %{_tmppath}/%{name}-root
+%buildroot %{_buildrootdir}/%{name}-root
#The sub-directory (relative to %{_builddir}) where sources are compiled.
#This macro is set after processing %setup, either explicitly from the
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ parsePrep.c rpm/ macros.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Oct-2008 18:50:04
Branch: HEAD Handle: 2008101916500300
Modified files:
rpm CHANGES macros.in
rpm/build parsePrep.c
Log:
add default patch fuzz macro
Summary:
RevisionChanges Path
1.2620 +1 -0 rpm/CHANGES
2.125 +4 -3 rpm/build/parsePrep.c
1.259 +6 -2 rpm/macros.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2619 -r1.2620 CHANGES
--- rpm/CHANGES 19 Oct 2008 07:46:48 - 1.2619
+++ rpm/CHANGES 19 Oct 2008 16:50:03 - 1.2620
@@ -1,5 +1,6 @@
5.2a2 - 5.2a3:
+- rpm.org: add %{_default_patch_fuzz} macro for patch --fuzz
- afb: make buildroot path configurable, but keep old defaults
- rpm.org: add %{_buildrootdir} macro for use with %{buildroot}
@@ .
patch -p0 '@@ .'
Index: rpm/build/parsePrep.c
$ cvs diff -u -r2.124 -r2.125 parsePrep.c
--- rpm/build/parsePrep.c 3 Aug 2008 14:00:58 - 2.124
+++ rpm/build/parsePrep.c 19 Oct 2008 16:50:03 - 2.125
@@ -71,7 +71,7 @@
* @param db saved file suffix (i.e. patch --suffix argument)
* @param reverseinclude -R?
* @param removeEmpties include -E?
- * @param fuzz include -F?
+ * @param fuzz include -F? (fuzz0 means no)
* @param subdir sub-directory (i.e patch -d argument);
* @return expanded %patch macro (NULL on error)
*/
@@ -99,7 +99,7 @@
#endif
if (subdir)
t = stpcpy( stpcpy(t, -d ), subdir);
-if (fuzz) {
+if (fuzz = 0) {
t = stpcpy(t, -F );
sprintf(t, %10.10d, fuzz);
t += strlen(t);
@@ -527,7 +527,8 @@
int patch_index, x;
memset(patch_nums, 0, sizeof(patch_nums));
-opt_P = opt_p = opt_R = opt_E = opt_F = 0;
+opt_P = opt_p = opt_R = opt_E = 0;
+opt_F =
rpmExpandNumeric(%{?_default_patch_fuzz}%{!?_default_patch_fuzz:-1});
opt_b = NULL;
opt_d = NULL;
patch_index = 0;
@@ .
patch -p0 '@@ .'
Index: rpm/macros.in
$ cvs diff -u -r1.258 -r1.259 macros.in
--- rpm/macros.in 19 Oct 2008 07:46:48 - 1.258
+++ rpm/macros.in 19 Oct 2008 16:50:03 - 1.259
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.258 2008/10/19 07:46:48 afb Exp $
+# $Id: macros.in,v 1.259 2008/10/19 16:50:03 afb Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -378,6 +378,9 @@
#
#%vendor
+#Default fuzz level for %patch in spec file.
+#%_default_patch_fuzz-1
+
#==
# Build configuration macros.
#
@@ -402,8 +405,9 @@
%define __patch_number %{-P:%{-P*}}%{!-P:0} \
%define __patch_file%{P:%{__patch_number}} \
%define __patch_suffix %{-b:-b --suffix %{-b*}} %{-z:--suffix %{-z*}} \
+%define __patch_fuzz%{?_default_patch_fuzz:%(test %{_default_patch_fuzz}
-ge 0 echo --fuzz=%{_default_patch_fuzz} )} \
%define __patch_options -s %{-p:-p%{-p*}} %{-F:-F%{-F*}} %{-d:-d%{-d*}}
%{-R} %{-E} %{__patch_suffix} \
-echo Patch #%{__patch_number} (%{basename:%{__patch_file}}):
%{uncompress:%{__patch_file}} | %{__patch} %{__patch_options}\
+echo Patch #%{__patch_number} (%{basename:%{__patch_file}}):
%{uncompress:%{__patch_file}} | %{__patch} %{__patch_fuzz}%{__patch_options}\
}
#
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ VENDOR rpm/rpmio/ macro.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Robert Scheck
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Oct-2008 20:01:28
Branch: HEAD Handle: 2008101918012701
Modified files:
rpm VENDOR
rpm/rpmio macro.c
Log:
Enable extension-based-compression-detection change because of LZMA
also for Fedora
Summary:
RevisionChanges Path
2.57+14 -0 rpm/VENDOR
2.204 +3 -3 rpm/rpmio/macro.c
patch -p0 '@@ .'
Index: rpm/VENDOR
$ cvs diff -u -r2.56 -r2.57 VENDOR
--- rpm/VENDOR11 Oct 2008 14:51:08 - 2.56
+++ rpm/VENDOR19 Oct 2008 18:01:27 - 2.57
@@ -461,6 +461,20 @@
rpm -bb operation.
+ Change: extension-based-compression-detection
+ Purpose:Prefer file extension for detecting file compression.
+ Reason: RPM tries to detect file compression by inspecting
+ magic bytes at the front of a file. This works for
+ formats with known magic bytes just fine, but fails
+ horribly for formats like LZMA where no such magic
+ bytes exist. For Fedora we prefer to first use file
+ extension based determination (if someone is mis-names
+ his distribution files we have to take action anyway)
+ and fall back to magic byte based determination only
+ if no well known extension is found. Additionally,
+ detecting LZMA we want to do via file extension only.
+
+
o Name: MANDRIVA
Vendor: Mandriva Linux http://wiki.mandriva.com/
Representative: Per Ãyvind Karlsen [EMAIL PROTECTED]
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/macro.c
$ cvs diff -u -r2.203 -r2.204 macro.c
--- rpm/rpmio/macro.c 22 Aug 2008 04:39:01 - 2.203
+++ rpm/rpmio/macro.c 19 Oct 2008 18:01:28 - 2.204
@@ -2412,13 +2412,13 @@
ssize_t nb;
int rc = -1;
unsigned char magic[13];
-#if defined(RPM_VENDOR_OPENPKG) /* extension-based-compression-detection */
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) /*
extension-based-compression-detection */
size_t file_len;
#endif
*compressed = COMPRESSED_NOT;
-#if defined(RPM_VENDOR_OPENPKG) /* extension-based-compression-detection */
+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) /*
extension-based-compression-detection */
file_len = strlen(file);
if ( (file_len 4 strcasecmp(file+file_len-4, .tbz) == 0)
|| (file_len 4 strcasecmp(file+file_len-4, .bz2) == 0)) {
@@ -2483,7 +2483,7 @@
magic[2] == 'Z' magic[3] == 'O') /* lzop */
*compressed = COMPRESSED_LZOP;
else
-#if !defined(RPM_VENDOR_OPENPKG) /* extension-based-compression-detection */
+#if !defined(RPM_VENDOR_OPENPKG) !defined(RPM_VENDOR_FEDORA) /*
extension-based-compression-detection */
/* XXX Ick, LZMA has no magic. See http://lkml.org/lkml/2005/6/13/285 */
if (magic[ 9] == (unsigned char) 0x00 magic[10] == (unsigned char)
0x00
magic[11] == (unsigned char) 0x00 magic[12] == (unsigned char) 0x00)
/* lzmash */
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: xar/ ChangeLog xar/lib/ Makefile.inc.in archive.c b64.c b64...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: xar Date: 19-Oct-2008 23:53:08 Branch: HEAD Handle: 2008101921530701 Modified files: xar ChangeLog xar/lib Makefile.inc.in archive.c b64.c b64.h bzxar.c io.c lzmaxar.c script.c xar/src xar.1 xar.c Log: some bugfixes from upstream Summary: RevisionChanges Path 1.14+15 -0 xar/ChangeLog 1.9 +2 -2 xar/lib/Makefile.inc.in 1.11+40 -0 xar/lib/archive.c 1.2 +0 -62 xar/lib/b64.c 1.2 +0 -1 xar/lib/b64.h 1.7 +27 -3 xar/lib/bzxar.c 1.9 +4 -2 xar/lib/io.c 1.6 +28 -3 xar/lib/lzmaxar.c 1.3 +7 -0 xar/lib/script.c 1.10+3 -0 xar/src/xar.1 1.13+39 -5 xar/src/xar.c patch -p0 '@@ .' Index: xar/ChangeLog $ cvs diff -u -r1.13 -r1.14 ChangeLog --- xar/ChangeLog 17 Dec 2007 08:02:53 - 1.13 +++ xar/ChangeLog 19 Oct 2008 21:53:07 - 1.14 @@ -1,4 +1,19 @@ devel + 2008-08-19 Rob Braun [EMAIL PROTECTED] + * lib/lzmaxar.c: if lzma compression is specified but not compiled in, throw an error. + * src/xar.c: When extracting, save directories until the end. This lets timestamps get set correctly on directories and addresses issue #58. + 2008-08-17 Rob Braun [EMAIL PROTECTED] + * lib/archive.c: Make sure the binary header and toc checksum types match. Contributed by Apple. + 2008-08-15 Rob Braun [EMAIL PROTECTED] + * lib/Makefile.inc.in: Add the $(LDFLAGS) variable when creating libxar + * src/xar.c: Fix a typo in the usage statement. + * lib/io.c: Fix seeking on a pipe + 2008-08-14 Rob Braun [EMAIL PROTECTED] + * lib/bzxar.c: if bzip2 compression is specified but not compiled in, throw an error. + * src/xar.c src/xar.1: Add -C to chdir before extraction. + * lib/script.c: Perform some input checking. + * lib/b64.c lib/b64.h: xar_to_base64() was never used, so it is removed. + * lib/lzmaxar.c: Update the use of the lzma API to match 4.42 alpha 6 of the lzma library from Anders F Björklund. 2007-12-14 Rob Braun [EMAIL PROTECTED] * configure.ac: Fix a broken configure check for sys/acl.h and acl_t 2007-12-09 Rob Braun [EMAIL PROTECTED] @@ . patch -p0 '@@ .' Index: xar/lib/Makefile.inc.in $ cvs diff -u -r1.8 -r1.9 Makefile.inc.in --- xar/lib/Makefile.inc.in 22 Nov 2007 22:57:24 - 1.8 +++ xar/lib/Makefile.inc.in 19 Oct 2008 21:53:07 - 1.9 @@ -137,7 +137,7 @@ $(LIBRXAR_S) : $(LIBXAR_SRCS:@[EMAIL PROTECTED]@[EMAIL PROTECTED]) @mkdir -p $(@D) ifeq (elf, @abi@) - $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@ + $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@ endif ifeq (macho, @abi@) $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name @[EMAIL PROTECTED](LIBRXAR_S) -o $@ $+ $(LDFLAGS) @LIBS@ @@ -153,7 +153,7 @@ $(LIBXAR_S) : $(LIBXAR_SRCS:@[EMAIL PROTECTED]@[EMAIL PROTECTED]) @mkdir -p $(@D) ifeq (elf, @abi@) - $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@ + $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@ endif ifeq (macho, @abi@) $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name $(LIBDIR)/$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@ @@ . patch -p0 '@@ .' Index: xar/lib/archive.c $ cvs diff -u -r1.10 -r1.11 archive.c --- xar/lib/archive.c 25 Feb 2008 09:17:14 - 1.10 +++ xar/lib/archive.c 19 Oct 2008 21:53:07 - 1.11 @@ -285,6 +285,46 @@ return NULL; } + /* check for inconsistency between checksum style in header, + * and the one described in the TOC; otherwise, you can flip + * the header bit to XAR_CKSUM_NONE, and nothing will ever + * verify that the TOC matches the checksum stored in the + * heap, and the signature check will pass on a modified + * file! rdar://problem/6134714 + */ +
[CVS] RPM: xar/lib/ lzmaxar.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: xar Date: 19-Oct-2008 23:56:39 Branch: HEAD Handle: 2008101921563900 Modified files: xar/lib lzmaxar.c Log: stop using the binary filters always Summary: RevisionChanges Path 1.7 +5 -11 xar/lib/lzmaxar.c patch -p0 '@@ .' Index: xar/lib/lzmaxar.c $ cvs diff -u -r1.6 -r1.7 lzmaxar.c --- xar/lib/lzmaxar.c 19 Oct 2008 21:53:07 - 1.6 +++ xar/lib/lzmaxar.c 19 Oct 2008 21:56:39 - 1.7 @@ -242,18 +242,12 @@ LZMA_CONTEXT(context)-options.check = LZMA_CHECK_CRC64; LZMA_CONTEXT(context)-options.has_crc32 = 1; /* true */ LZMA_CONTEXT(context)-options.alignment = 0; -#if defined (__ppc__) || defined (powerpc) || defined (__ppc64__) - LZMA_CONTEXT(context)-options.filters[0].id = LZMA_FILTER_POWERPC; -#elif defined (__i386__) || defined (__amd64__) || defined(__x86_64__) - LZMA_CONTEXT(context)-options.filters[0].id = LZMA_FILTER_X86; -#else - LZMA_CONTEXT(context)-options.filters[0].id = LZMA_FILTER_COPY; -#endif - LZMA_CONTEXT(context)-options.filters[0].options = NULL; - LZMA_CONTEXT(context)-options.filters[1].id = LZMA_FILTER_LZMA; - LZMA_CONTEXT(context)-options.filters[1].options = (lzma_options_lzma *)(lzma_preset_lzma + level - 1); + /* don't use LZMA_FILTER_POWERPC or LZMA_FILTER_X86 filters, +since they might make compression worse for regular files */ + LZMA_CONTEXT(context)-options.filters[0].id = LZMA_FILTER_LZMA; + LZMA_CONTEXT(context)-options.filters[0].options = (lzma_options_lzma *)(lzma_preset_lzma + level - 1); /* Terminate the filter options array. */ - LZMA_CONTEXT(context)-options.filters[2].id = UINT64_MAX; + LZMA_CONTEXT(context)-options.filters[1].id = UINT64_MAX; LZMA_CONTEXT(context)-lzma = LZMA_STREAM_INIT_VAR; #if LZMA_VERSION 40420010U LZMA_CONTEXT(context)-limit = lzma_memory_limitter_create(memory_limit); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: xar/lib/ lzmaxar.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: xar Date: 20-Oct-2008 00:13:53 Branch: HEAD Handle: 2008101922135300 Modified files: xar/lib lzmaxar.c Log: change application/x-lzma to application/x-xz now Summary: RevisionChanges Path 1.9 +6 -3 xar/lib/lzmaxar.c patch -p0 '@@ .' Index: xar/lib/lzmaxar.c $ cvs diff -u -r1.8 -r1.9 lzmaxar.c --- xar/lib/lzmaxar.c 19 Oct 2008 22:07:31 - 1.8 +++ xar/lib/lzmaxar.c 19 Oct 2008 22:13:53 - 1.9 @@ -119,7 +119,8 @@ if( tmpp ) opt = xar_attr_pget(f, tmpp, style); if( !opt ) return 0; - if( strcmp(opt, application/x-lzma) != 0 ) return 0; + if( strcmp(opt, application/x-lzma) != 0 + strcmp(opt, application/x-xz) != 0) return 0; lzma_init_decoder(); #ifdef LZMA_STREAM_INIT_VAR @@ -184,7 +185,8 @@ if( tmpp ) opt = xar_attr_pget(f, tmpp, style); if( !opt ) return 0; - if( strcmp(opt, application/x-lzma) != 0 ) return 0; + if( strcmp(opt, application/x-lzma) != 0 + strcmp(opt, application/x-xz) != 0) return 0; xar_err_new(x); xar_err_set_file(x, f); xar_err_set_errno(x, 0); @@ -209,7 +211,8 @@ tmpp = xar_prop_pset(f, p, encoding, NULL); if( tmpp ) - xar_attr_pset(f, tmpp, style, application/x-lzma); + /* mime-type application/x-lzma is for LZMA_Alone */ + xar_attr_pset(f, tmpp, style, application/x-xz); } /* free the context */ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 20-Oct-2008 00:27:40 Branch: HEAD Handle: 2008101922274000 Modified files: rpm devtool.conf Log: macosx: add %darwin alias for puredarwin use Summary: RevisionChanges Path 2.249 +3 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.248 -r2.249 devtool.conf --- rpm/devtool.conf 19 Oct 2008 21:41:50 - 2.248 +++ rpm/devtool.conf 19 Oct 2008 22:27:40 - 2.249 @@ -1159,6 +1159,9 @@ platform=Leopard @source %macosx +%darwin +%macosx + %macosx ## ## Builds a Universal Binary (ppc/i386), on the Mac OS X 10.x platforms. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
