[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 21-Oct-2011 15:51:40
Branch: rpm-5_4 Handle: 2011102113513901
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
add back $RPM_BUILD_DIR to scriptlet envvar's as it's required by
scripts/find-debuginfo.sh.
Summary:
RevisionChanges Path
1.3501.2.185+2 -0 rpm/CHANGES
1.4.4.11+3 -2 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.184 -r1.3501.2.185 CHANGES
--- rpm/CHANGES 19 Oct 2011 12:59:18 - 1.3501.2.184
+++ rpm/CHANGES 21 Oct 2011 13:51:39 - 1.3501.2.185
@@ -1,4 +1,6 @@
5.4.3 - 5.4.4:
+- proyvind: add back $RPM_BUILD_DIR to scriptlet envvar's as it's
required
+ by scripts/find-debuginfo.sh.
- proyvind: fix different epoch being ignored when comparing two packages
with same NVRA.
- proyvind: add %ruby_sitedir and %ruby_vendor macros.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.4.10 -r1.4.4.11 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 30 Sep 2011 19:54:29 - 1.4.4.10
+++ rpm/macros/macros.rpmbuild.in 21 Oct 2011 13:51:40 - 1.4.4.11
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.4.10 2011/09/30 19:54:29 jbj Exp $
+# $Id: macros.rpmbuild.in,v 1.4.4.11 2011/10/21 13:51:40 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -301,8 +301,9 @@
%___build_args -e
%___build_cmd%{?_sudo:%{_sudo} }%{?_remsh:%{_remsh}
%{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot}
}%{___build_shell} %{___build_args}
%___build_pre\
+ RPM_BUILD_DIR=\%{u2p:%{_builddir}}\\
RPM_OPT_FLAGS=\%{optflags}\\
- export RPM_OPT_FLAGS\
+ export RPM_BUILD_DIR RPM_OPT_FLAGS\
%{?buildroot:RPM_BUILD_ROOT=\%{u2p:%{buildroot}}\\
export RPM_BUILD_ROOT}\
%{?_javaclasspath:CLASSPATH=\%{_javaclasspath}\\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/lib/ transaction.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 19-Oct-2011 15:00:53
Branch: rpm-5_3 Handle: 2011101913005201
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/lib transaction.c
Log:
fix different epoch being ignored when comparing two packages with
same NVRA.
Summary:
RevisionChanges Path
1.3296.2.251+2 -0 rpm/CHANGES
1.428.2.8 +22 -16 rpm/lib/transaction.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.250 -r1.3296.2.251 CHANGES
--- rpm/CHANGES 15 Oct 2011 12:58:19 - 1.3296.2.250
+++ rpm/CHANGES 19 Oct 2011 13:00:52 - 1.3296.2.251
@@ -1,4 +1,6 @@
5.3.12 - 5.3.13
+- proyvind: fix different epoch being ignored when comparing two packages
+ with same NVRA.
- proyvind: add %ruby_sitedir and %ruby_vendor macros.
- proyvind: really always invoke %clean at end
- proyvind: add sparc64v2 arch to %sparcx.
@@ .
patch -p0 '@@ .'
Index: rpm/lib/transaction.c
$ cvs diff -u -r1.428.2.7 -r1.428.2.8 transaction.c
--- rpm/lib/transaction.c 12 Jul 2011 10:44:41 - 1.428.2.7
+++ rpm/lib/transaction.c 19 Oct 2011 13:00:53 - 1.428.2.8
@@ -1169,28 +1169,34 @@
RPMMIRE_STRCMP, rpmteNEVRA(p), keys);
nkeys = argvCount(keys);
-#if defined(RPM_VENDOR_MANDRIVA)
/* mdvbz: #63711
- * workaround for distepoch never being added to RPMTAG_NVRA yet,
- * leading to packages of same EVRA but with different distepoch
+ * workaround for epoch distepoch not being part of RPMTAG_NVRA,
+ * leading to packages of same VRA but with different epoch or
distepoch
* being treated as the same package */
if (nkeys 0) {
- int i;
- for (i = 0; i nkeys; i++) {
- rpmmi mi = rpmtsInitIterator(ts, RPMTAG_NVRA, keys[i], 0);
- Header h;
- while ((h = rpmmiNext(mi)) != NULL) {
- HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
- he-tag = RPMTAG_DISTEPOCH;
- xx = headerGet(h, he, 0);
- if (strcmp(he-p.str ? he-p.str : , rpmteD(p) ?
rpmteD(p) : ))
- nkeys--;
- he-p.ptr = _free(he-p.ptr);
+ int i, t;
+ rpmTag tags[2] = { RPMTAG_EPOCH, RPMTAG_DISTEPOCH };
+ for (t = 0; t 2; t++) {
+ for (i = 0; i nkeys; i++) {
+ rpmmi mi = rpmtsInitIterator(ts, RPMTAG_NVRA, keys[i],
0);
+ Header h;
+ while ((h = rpmmiNext(mi)) != NULL) {
+ HE_t he = memset(alloca(sizeof(*he)), 0,
sizeof(*he));
+ const char *val = NULL;
+ he-tag = tags[t];
+ xx = headerGet(h, he, 0);
+ if (he-tag == RPMTAG_EPOCH)
+ val = rpmteE(p);
+ else if (he-tag == RPMTAG_DISTEPOCH)
+ val = rpmteD(p);
+ if (strcmp(he-p.str ? he-p.str : , val ? val :
))
+ nkeys--;
+ he-p.ptr = _free(he-p.ptr);
+ }
+ mi = rpmmiFree(mi);
}
- mi = rpmmiFree(mi);
}
}
-#endif
if (nkeys 0)
rpmpsAppend(ps, RPMPROB_PKG_INSTALLED,
rpmteNEVR(p), rpmteKey(p),
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ ruby.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 15-Oct-2011 14:56:57
Branch: rpm-5_4 Handle: 2011101512565601
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros ruby.in
Log:
add %ruby_sitedir and %ruby_vendor macros.
Summary:
RevisionChanges Path
1.3501.2.183+1 -0 rpm/CHANGES
1.4.2.2 +2 -0 rpm/macros/ruby.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.182 -r1.3501.2.183 CHANGES
--- rpm/CHANGES 12 Oct 2011 16:51:51 - 1.3501.2.182
+++ rpm/CHANGES 15 Oct 2011 12:56:56 - 1.3501.2.183
@@ -1,4 +1,5 @@
5.4.3 - 5.4.4:
+- proyvind: add %ruby_sitedir and %ruby_vendor macros.
- devzero2000: get rid of bashisms in dbconvert.sh and gstreamer.sh
- jbj: start rpm-5.4.4 development.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/ruby.in
$ cvs diff -u -r1.4.2.1 -r1.4.2.2 ruby.in
--- rpm/macros/ruby.in1 Apr 2011 02:03:43 - 1.4.2.1
+++ rpm/macros/ruby.in15 Oct 2011 12:56:57 - 1.4.2.2
@@ -15,8 +15,10 @@
%ruby_archdir%(%{__ruby} -rrbconfig -e 'print
Config::CONFIG[archdir]')
%ruby_libdir %(%{__ruby} -rrbconfig -e 'print
Config::CONFIG[rubylibdir]')
+%ruby_sitedir%(%{__ruby} -rrbconfig -e 'print
Config::CONFIG[sitedir]')
%ruby_sitearchdir%(%{__ruby} -rrbconfig -e 'print
Config::CONFIG[sitearchdir]')
%ruby_sitelibdir %(%{__ruby} -rrbconfig -e 'print
Config::CONFIG[sitelibdir]')
+%ruby_vendordir %(%{__ruby} -rrbconfig -e 'print
Config::CONFIG[vendordir]')
%ruby_vendorarchdir %(%{__ruby} -rrbconfig -e 'print
Config::CONFIG[vendorarchdir]')
%ruby_vendorlibdir %(%{__ruby} -rrbconfig -e 'print
Config::CONFIG[vendorlibdir]')
%ruby_gemdir %(%{__ruby} -rrbconfig -e 'include Config; print
CONFIG[rubylibdir].sub(CONFIG[ruby_version],
gems/#{CONFIG[ruby_version]})')
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ Makefile.am mdvbz23677-1.0-1.src.rpm
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 14-Oct-2011 22:24:47
Branch: HEAD Handle: 2011101420244600
Added files:
rpm/tests mdvbz23677-1.0-1.src.rpm
Modified files:
rpm/tests Makefile.am
Log:
add a reproducer for mdvbz#23677
Summary:
RevisionChanges Path
1.103 +7 -0 rpm/tests/Makefile.am
1.1 BLOBrpm/tests/mdvbz23677-1.0-1.src.rpm
patch -p0 '@@ .'
Index: rpm/tests/Makefile.am
$ cvs diff -u -r1.102 -r1.103 Makefile.am
--- rpm/tests/Makefile.am 12 Sep 2011 21:10:59 - 1.102
+++ rpm/tests/Makefile.am 14 Oct 2011 20:24:46 - 1.103
@@ -797,6 +797,13 @@
@${rpm} -qa --qf '[%{FILENAMES}: %{FILEREQUIRE}\n]' /dev/null
@${rpm} -qa --qf '[%{FSNAMES}: %{FSSIZES}\n]' /dev/null
+check-mdvbz23677:
+ @echo === $@ ===
+ @${rpm} -U --noparentdirs --nodeps mdvbz23677/mdvbz23677-first*.rpm
+ @${rpm} -U --noparentdirs --nodeps mdvbz23677/mdvbz23677-second*.rpm ||
/bin/true
+ @${rpm} -q mdvbz23677-first /dev/null
+ @${rpm} -q mdvbz23677-second /dev/null; [ $$? -ne 0 ]
+
check-rpmv3:
@echo === $@ ===
@${rpm} -qlp simplestRPMv3-1.0-2.aix5.3.noarch.rpm
@@ .
(cd rpm/tests \
uudecode '@@ .' \
xdelta patch mdvbz23677-1.0-1.src.rpm.xdelta /dev/null
mdvbz23677-1.0-1.src.rpm \
rm -f mdvbz23677-1.0-1.src.rpm.xdelta)
Index: rpm/tests/mdvbz23677-1.0-1.src.rpm
begin 664 mdvbz23677-1.0-1.src.rpm.xdelta
M)5A$6C`P-4(`!$`$`!S:EE;$N-3DY-C(N
M;G5L;'-H:65L82XU.3DV,BYA;P?BP@#[9=[!O%#/K\82;B%
M$!J2R378V.!8[Y-2=##LF7)DJR'A06QM*M=?[L[WT,/!*0SI\`A.('$A
MD$+,!-)00R%0`@V%$*!`IX10TDQ!TDX3GA$S#,W'WI+6=,FUG.M/I7^S8
M_O;[]OO^_;;_=;K3R^.U%_]:S?'-CQPI`)UYV!8U7GPNZ+Q[;`WSH,
MJS@#L=*BD.?![X_*?0S.K3HO]7P]VK$GR#]=7Y59\C^9@B7SDU-87D.SL
MDK\!U5C/Z[$?E)3Z=]R1UM-%=8XBE568Y500ZVJ^VV/-+B@_L#.B`H;-Y^8
M;UE9T0$LRR8O,R++;0X7CZ%C1NN7;M7=MV+FN#-R[[YAZ!K_P:]SI`V
MV'1675*?MNA2))E.F5-)O4UO2EJ,25LK2.M,!IV-+WIS,4O/?9DM]CN;?CE
M$Q/GUBVO@UC/CB=!QCN'D=/[0?VO^OG5:7.@RK_19^5V*ENJG]N?1^7X
MUB(=J%NA1ER)S=8EK-/*!Q`?1?PXXH\0_P;K5L5Y*0?XKX*\2?8:4ZKKX:
M\?E^=7K$!]#\C'$7R#Y%L3'$?\:\0G$#R'^$OT_Z_*_JL_1OP=DI]$?++,
M-6B/H7XG#)75Y?CJ5F$6+FSX%5:@R-6(5Z*6(WTZQ?4YG31/BN8@]B.A
M?1_BLY`\B+@.1SQ?*1/(FY\5*(W8@YQ!U(_WK$G8AO0NQ!]F]'$)RE/_J
M)(K^5\`^JRO'9Z_JJRO'9Z?C_B2ICRU=R,F$3^*#@SB-_BVY_
MYQ`_B/A%Q`\A?@GQ+L2OE/GL,63O=86=6(O2'.T='C\[`CBP:C#YW'BWO8^
MW.$+.+TEL;H7+-L6UX*-B-FS5C=Z`-SD``I%7KI(K[V=-.=DM?=H`+
M.Q.E[.]U]_!DYXTP7=S5N/R9_W=;#?=N`3/EB\1SIM:TUND-%UN-N:4
MA?#AW5B/2JK;WD,![`K8V$QOMW\(:F*1=:F]UGC:HPZF-TC[!YH'
MLHY8,*OM\'AC?)?H+3HCEIK9T,N9Y%S%7KC:B;F_00S4-LL3?=.@7Z,$N
M60@5@@WO6M`2.I=+F-SMPG([KPS0W'-(9,Q'1:T8B2`#1%G'Q[O#D^T
M76WOZ+Z^`Z[U41I!UT@P^BC;G^AH!5[^#R@S*D7:9BP)^BVXTPZ,AP']/J
MM9T(:_K\E;W,-DEQVR%`9F4=[@R=-)C(OCC#:KE(I[758_`.:F(.H(
MN(3B8!^5282)B;D37DB]H%6TDT9BX*SLV@%3H-N*YU1\FHKHG3Q@GE2P
MK]F7LP[`VF[,\Y[F:*G7S87D!;^[3S(+`Y3KE/(.BSYJ;PS\RPJL+
MQ#U94U#JCE)R)*1.LMK``!@6M')G=S`:;0VD#7XMWS/,#?7%VCWX3R;RX7
M\59[).H!:EEW-1SH`UK$7$8Y[W+RW7PJW!%3!])^?5\JUANW9XPNG\X[
MF!\*,UN)#3Z2Q91B?G!VW-$I7)A`W:.-`WB_J^#C6W;;ER]7+P_S/;WJ
MTCEK][O^PR'$LF0N.6PP6JQ63*_187HL!'B!(^44$/`T)^`-O`!D%D\3-,+
M`!?@/C(2S69PFL63G$3!KR@1#`-(+$+1(@Y_*CU3S9*/BXH.=H/2PN2H`@
M2X]HUR)^%YMJ3^8Q`D`!/UP6YQ@2VI`XG`5Y(*ASY9)9IB@C/;$\BV,!
MSA.I02(#XI@PH!5F2$2R,$YII4F+)4W2*4D/NPF6%.@@8L\2-%I.H53
MT`!.D!DR5!K,YSPB`A#)+XH`NV4E*U%K4Z0DWG`X?#0%FZ1!2
MXH(!*,(4AQ+-N(BQD,504^:V83AI`R@AU(P2G[A,JVF!)H7EI63G!C
MFA9$J1$N@YPUEA2AF`]LI[@4QJE#^PRN-4LN@U,+?%',V6GXY8Y3,@GTT
M*QP:2I*!JW=Q68)FL2,\MDMI8FXEQ`8$;#XI3Q`MB[+HED:3LBLP%QP
M40S'9P$K:2,QX@8)4E\FU8K\%FSHJ+%F)(SEB.$%%6.XYI[2C%:C4DSJ3=8
M3!L(:Q4ZK5;+!8S%9@,J;2-KW@MX+^(QS;+8'W[I3Y3L3.WVIN-ZHMUD,
M1IO.4)K;A%W\ZN;I=T=#(B%D5=HDS6J%+`8I)Z89(B.J=(6T#C8X1`A)6A((
MH9B0H!!@B1-L*J@0',+17;VD68#8DFF#87X)4M:`L*@$3=$-R:;+;4#L9
M.%)8EL[2Q%LHAM#@$0@R+TD)1IADRDX6XG2%I12A!,AE/IIT4QTDD+:@:
MUB0DCH]$:TCZOY0H%`!.I`,TPB!YUP@FIZ*^P1`@9(52O*PJVP)BVEV
MC!-5Y2V8$90H*EDWYF)DXT@+Q-/,EGK$QTK!F92+#RB.*F5)JH8FD*(X
MO+XST-U^D;+AI?BA7!8%AD[`946=K6PKTBA`.6[O%#%^_0(M)J4,[+`J-#Q
M2(T,P-9E41H]RHM!27!=J9DS#C#9-VMD[K07:2WZ%CB@*9_`EAE#6`-)
MBY)`)V4)7BFJ[Q5'20C/`(SR9RN5OBBGTW2A#5I24C$[,E)6/2WVTRL$:V)
M+%==LDVL#13,@J_ZZLP35?U5V#0)@`$Y=B@PS!3S0WHDE0IUWFIS7K7
M*%=AOVK0%,\S6989K'6J?KI8G782.[ZS#X/C'_FWW!T%-_:DIYX6)U2]:7
[CVS] RPM: rpm/scripts/ gendiff
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 06-Oct-2011 20:19:45
Branch: HEAD Handle: 2011100618194500
Modified files:
rpm/scripts gendiff
Log:
use bash shell as interpreter due to bashism
Summary:
RevisionChanges Path
1.7 +1 -1 rpm/scripts/gendiff
patch -p0 '@@ .'
Index: rpm/scripts/gendiff
$ cvs diff -u -r1.6 -r1.7 gendiff
--- rpm/scripts/gendiff 21 Oct 2009 16:25:59 - 1.6
+++ rpm/scripts/gendiff 6 Oct 2011 18:19:45 - 1.7
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
usage () {
echo usage: $0 directory diff-extension 12
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/scripts/ gendiff
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 06-Oct-2011 20:20:24
Branch: rpm-5_3 Handle: 2011100618202400
Modified files: (Branch: rpm-5_3)
rpm/scripts gendiff
Log:
use bash shell as interpreter due to bashism
Summary:
RevisionChanges Path
1.6.2.1 +1 -1 rpm/scripts/gendiff
patch -p0 '@@ .'
Index: rpm/scripts/gendiff
$ cvs diff -u -r1.6 -r1.6.2.1 gendiff
--- rpm/scripts/gendiff 21 Oct 2009 16:25:59 - 1.6
+++ rpm/scripts/gendiff 6 Oct 2011 18:20:24 - 1.6.2.1
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
usage () {
echo usage: $0 directory diff-extension 12
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/build/ parseChangelog.c parseFile...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 25-Aug-2011 20:35:20
Branch: rpm-5_3 Handle: 2011082518351901
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/build parseChangelog.c parseFiles.c
Log:
really always invoke %clean at end.
Summary:
RevisionChanges Path
1.3296.2.249+1 -0 rpm/CHANGES
2.50.4.2+0 -8 rpm/build/parseChangelog.c
2.36.4.3+0 -5 rpm/build/parseFiles.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.248 -r1.3296.2.249 CHANGES
--- rpm/CHANGES 29 Jul 2011 04:27:49 - 1.3296.2.248
+++ rpm/CHANGES 25 Aug 2011 18:35:19 - 1.3296.2.249
@@ -1,4 +1,5 @@
5.3.12 - 5.3.13
+- proyvind: really always invoke %clean at end
- proyvind: add sparc64v2 arch to %sparcx.
- proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
@@ .
patch -p0 '@@ .'
Index: rpm/build/parseChangelog.c
$ cvs diff -u -r2.50.4.1 -r2.50.4.2 parseChangelog.c
--- rpm/build/parseChangelog.c7 Jun 2011 16:34:10 - 2.50.4.1
+++ rpm/build/parseChangelog.c25 Aug 2011 18:35:20 - 2.50.4.2
@@ -269,11 +269,7 @@
/* There are no options to %changelog */
if ((rc = readLine(spec, STRIP_COMMENTS)) 0) {
iob = rpmiobFree(iob);
-#if defined(RPM_VENDOR_MANDRIVA)
- return (spec-clean == NULL) ? PART_CLEAN : PART_NONE;
-#else
return PART_NONE;
-#endif
}
if (rc != RPMRC_OK)
return rc;
@@ -285,11 +281,7 @@
iob = rpmiobAppend(iob, spec-line, 0);
line = _free(line);
if ((rc = readLine(spec, STRIP_COMMENTS | STRIP_NOEXPAND)) 0) {
-#if defined(RPM_VENDOR_MANDRIVA)
- nextPart = (spec-clean == NULL) ? PART_CLEAN : PART_NONE;
-#else
nextPart = PART_NONE;
-#endif
break;
}
if (rc != RPMRC_OK)
@@ .
patch -p0 '@@ .'
Index: rpm/build/parseFiles.c
$ cvs diff -u -r2.36.4.2 -r2.36.4.3 parseFiles.c
--- rpm/build/parseFiles.c25 Mar 2011 17:46:07 - 2.36.4.2
+++ rpm/build/parseFiles.c25 Aug 2011 18:35:20 - 2.36.4.3
@@ -114,12 +114,7 @@
}
}
-#if defined(RPM_VENDOR_MANDRIVA)
-/* if no %clean section, add implicit */
-rc = (nextPart == PART_NONE spec-clean == NULL) ? PART_CLEAN :
nextPart;
-#else
rc = nextPart;
-#endif
exit:
argv = _free(argv);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ bdist_rpm5.py
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 18-Aug-2011 08:48:50 Branch: HEAD Handle: 2011081806485000 Modified files: rpm/scripts bdist_rpm5.py Log: dd license classifier to bdist_rpm5.py (Alexandré Lissy ali...@mandriva.com Summary: RevisionChanges Path 1.3 +8 -1 rpm/scripts/bdist_rpm5.py patch -p0 '@@ .' Index: rpm/scripts/bdist_rpm5.py $ cvs diff -u -r1.2 -r1.3 bdist_rpm5.py --- rpm/scripts/bdist_rpm5.py 31 May 2011 20:19:44 - 1.2 +++ rpm/scripts/bdist_rpm5.py 18 Aug 2011 06:48:50 - 1.3 @@ -51,7 +51,14 @@ else: spec_file[-1] += '.gz' -license = self.distribution.get_license().replace(GPL , GPLv).strip() +license = self.distribution.get_license() +if license == UNKNOWN: +classifiers = self.distribution.get_classifiers() +for classifier in classifiers: +values = classifier.split( :: ) +if values[0] == License: +license = values[-1] +license.replace(GPL , GPLv).strip() spec_file.extend([ 'License:\t' + license, 'Group:\t\t' + self.group,]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 28-Jul-2011 09:50:40
Branch: HEAD Handle: 2011072807503901
Modified files:
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
add armv7hl to %arm (from Paulo Andrade p...@mandriva.com.br).
Summary:
RevisionChanges Path
1.3663 +1 -0 rpm/CHANGES
1.9 +2 -2 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3662 -r1.3663 CHANGES
--- rpm/CHANGES 12 Jul 2011 10:41:19 - 1.3662
+++ rpm/CHANGES 28 Jul 2011 07:50:39 - 1.3663
@@ -1,4 +1,5 @@
HEAD:
+- proyvind: add armv7hl to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
- proyvind: fix rpm treating packages of same NVRA, but different
distepoch
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.8 -r1.9 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 26 May 2011 14:26:27 - 1.8
+++ rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:50:40 - 1.9
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.8 2011/05/26 14:26:27 devzero2000 Exp $
+# $Id: macros.rpmbuild.in,v 1.9 2011/07/28 07:50:40 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -634,7 +634,7 @@
%efi %{ix86} x86_64 ia64
# same thing for arm
-%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l
+%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
# same for alpha
%alpha alpha alphaev56 alphaev6 alphaev67
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 28-Jul-2011 09:52:58
Branch: rpm-5_3 Handle: 2011072807525701
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
add armv7hl to %arm (from Paulo Andrade p...@mandriva.com.br).
Summary:
RevisionChanges Path
1.3296.2.245+1 -0 rpm/CHANGES
1.4.2.4 +2 -2 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.244 -r1.3296.2.245 CHANGES
--- rpm/CHANGES 12 Jul 2011 10:45:05 - 1.3296.2.244
+++ rpm/CHANGES 28 Jul 2011 07:52:57 - 1.3296.2.245
@@ -1,4 +1,5 @@
5.3.12 - 5.3.13
+- proyvind: add armv7hl to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
- proyvind: fix rpm treating packages of same NVRA, but different
distepoch
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.2.3 -r1.4.2.4 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 9 May 2011 16:01:41 - 1.4.2.3
+++ rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:52:58 - 1.4.2.4
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.2.3 2011/05/09 16:01:41 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.4 2011/07/28 07:52:58 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -633,7 +633,7 @@
%efi %{ix86} x86_64 ia64
# same thing for arm
-%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l
+%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
# same for alpha
%alpha alpha alphaev56 alphaev6 alphaev67
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 29-Jul-2011 03:11:59
Branch: HEAD Handle: 2011072901115900
Modified files:
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
rename armv7hl to armv7l
(http://lists.fedoraproject.org/pipermail/arm/2011-July/001596.html)
Summary:
RevisionChanges Path
1.3664 +1 -1 rpm/CHANGES
1.10+2 -2 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3663 -r1.3664 CHANGES
--- rpm/CHANGES 28 Jul 2011 07:50:39 - 1.3663
+++ rpm/CHANGES 29 Jul 2011 01:11:59 - 1.3664
@@ -1,5 +1,5 @@
HEAD:
-- proyvind: add armv7hl to %arm (from Paulo Andrade
p...@mandriva.com.br).
+- proyvind: add armv7l to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
- proyvind: fix rpm treating packages of same NVRA, but different
distepoch
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.9 -r1.10 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:50:40 - 1.9
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:11:59 - 1.10
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.9 2011/07/28 07:50:40 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.10 2011/07/29 01:11:59 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -634,7 +634,7 @@
%efi %{ix86} x86_64 ia64
# same thing for arm
-%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
+%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7l
# same for alpha
%alpha alpha alphaev56 alphaev6 alphaev67
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 29-Jul-2011 03:13:23
Branch: rpm-5_4 Handle: 2011072901132300
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
rename armv7hl to armv7l
(http://lists.fedoraproject.org/pipermail/arm/2011-July/001596.html)
Summary:
RevisionChanges Path
1.3501.2.149+1 -1 rpm/CHANGES
1.4.4.5 +2 -2 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.148 -r1.3501.2.149 CHANGES
--- rpm/CHANGES 28 Jul 2011 07:51:47 - 1.3501.2.148
+++ rpm/CHANGES 29 Jul 2011 01:13:23 - 1.3501.2.149
@@ -1,5 +1,5 @@
5.4.1 - 5.4.2
-- proyvind: add armv7hl to %arm (from Paulo Andrade
p...@mandriva.com.br).
+- proyvind: add armv7l to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
- proyvind: fix rpm treating packages of same NVRA, but different
distepoch
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.4.4 -r1.4.4.5 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:51:48 - 1.4.4.4
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:13:23 - 1.4.4.5
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.4.4 2011/07/28 07:51:48 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.4.5 2011/07/29 01:13:23 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -633,7 +633,7 @@
%efi %{ix86} x86_64 ia64
# same thing for arm
-%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
+%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7l
# same for alpha
%alpha alpha alphaev56 alphaev6 alphaev67
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 29-Jul-2011 03:14:07
Branch: rpm-5_3 Handle: 2011072901140600
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
rename armv7hl to armv7l
(http://lists.fedoraproject.org/pipermail/arm/2011-July/001596.html)
Summary:
RevisionChanges Path
1.3296.2.246+1 -1 rpm/CHANGES
1.4.2.5 +2 -2 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.245 -r1.3296.2.246 CHANGES
--- rpm/CHANGES 28 Jul 2011 07:52:57 - 1.3296.2.245
+++ rpm/CHANGES 29 Jul 2011 01:14:06 - 1.3296.2.246
@@ -1,5 +1,5 @@
5.3.12 - 5.3.13
-- proyvind: add armv7hl to %arm (from Paulo Andrade
p...@mandriva.com.br).
+- proyvind: add armv7l to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
- proyvind: fix rpm treating packages of same NVRA, but different
distepoch
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.2.4 -r1.4.2.5 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:52:58 - 1.4.2.4
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:14:06 - 1.4.2.5
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.2.4 2011/07/28 07:52:58 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.5 2011/07/29 01:14:06 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -633,7 +633,7 @@
%efi %{ix86} x86_64 ia64
# same thing for arm
-%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
+%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b
armv5te armv5tel armv5teb xscale armv6 armv6l armv7l
# same for alpha
%alpha alpha alphaev56 alphaev6 alphaev67
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 29-Jul-2011 03:59:41
Branch: HEAD Handle: 2011072901594100
Modified files:
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit
sparc archs only, with %sparcx being all 32 bit archs AND 64 bit archs
Summary:
RevisionChanges Path
1.3665 +3 -0 rpm/CHANGES
1.11+3 -3 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3664 -r1.3665 CHANGES
--- rpm/CHANGES 29 Jul 2011 01:11:59 - 1.3664
+++ rpm/CHANGES 29 Jul 2011 01:59:41 - 1.3665
@@ -1,4 +1,7 @@
HEAD:
+- proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
+ all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
+ 64 bit archs
- proyvind: add armv7l to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.10 -r1.11 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:11:59 - 1.10
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:59:41 - 1.11
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.10 2011/07/29 01:11:59 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.11 2011/07/29 01:59:41 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -640,10 +640,10 @@
%alpha alpha alphaev56 alphaev6 alphaev67
# and sparc
-%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
+%sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v
sparcv9v2
# add alternative sparc architectures macro (bugzilla #455972 patch)
-%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+%sparcx %sparc sparc64 sparc64v
# also for mips
%mips mips mips2 mips3 mips4 octeon
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 29-Jul-2011 04:03:02
Branch: rpm-5_4 Handle: 2011072902030100
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit
sparc archs only, with %sparcx being all 32 bit archs AND 64 bit archs
Summary:
RevisionChanges Path
1.3501.2.150+3 -0 rpm/CHANGES
1.4.4.6 +3 -3 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.149 -r1.3501.2.150 CHANGES
--- rpm/CHANGES 29 Jul 2011 01:13:23 - 1.3501.2.149
+++ rpm/CHANGES 29 Jul 2011 02:03:01 - 1.3501.2.150
@@ -1,4 +1,7 @@
5.4.1 - 5.4.2
+- proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
+ all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
+ 64 bit archs
- proyvind: add armv7l to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.4.5 -r1.4.4.6 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:13:23 - 1.4.4.5
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 02:03:01 - 1.4.4.6
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.4.5 2011/07/29 01:13:23 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.4.6 2011/07/29 02:03:01 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -639,10 +639,10 @@
%alpha alpha alphaev56 alphaev6 alphaev67
# and sparc
-%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
+%sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v
sparcv9v2
# add alternative sparc architectures macro (bugzilla #455972 patch)
-%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+%sparcx %sparc sparc64 sparc64v
# also for mips
%mips mips mips2 mips3 mips4 octeon
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 29-Jul-2011 06:16:07
Branch: rpm-5_3 Handle: 2011072904160600
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit
sparc archs only, with %sparcx being all 32 bit archs AND 64 bit archs
Summary:
RevisionChanges Path
1.3296.2.247+3 -0 rpm/CHANGES
1.4.2.6 +3 -3 rpm/macros/macros.rpmbuild.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.246 -r1.3296.2.247 CHANGES
--- rpm/CHANGES 29 Jul 2011 01:14:06 - 1.3296.2.246
+++ rpm/CHANGES 29 Jul 2011 04:16:06 - 1.3296.2.247
@@ -1,4 +1,7 @@
5.3.12 - 5.3.13
+- proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
+ all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
+ 64 bit archs
- proyvind: add armv7l to %arm (from Paulo Andrade
p...@mandriva.com.br).
- proyvind: fix rpm not comparing distepoch if missing from one package
when doing comparision.
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.2.5 -r1.4.2.6 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:14:06 - 1.4.2.5
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:16:06 - 1.4.2.6
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.2.5 2011/07/29 01:14:06 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.6 2011/07/29 04:16:06 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -639,10 +639,10 @@
%alpha alpha alphaev56 alphaev6 alphaev67
# and sparc
-%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
+%sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v
sparcv9v2
# add alternative sparc architectures macro (bugzilla #455972 patch)
-%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+%sparcx %sparc sparc64 sparc64v
# also for mips
%mips mips mips2 mips3 mips4 octeon
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 29-Jul-2011 06:26:06 Branch: HEAD Handle: 2011072904260600 Modified files: rpm CHANGES rpm/macros macros.rpmbuild.in Log: add sparc64v2 arch to %sparcx Summary: RevisionChanges Path 1.3666 +2 -1 rpm/CHANGES 1.12+2 -2 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3665 -r1.3666 CHANGES --- rpm/CHANGES 29 Jul 2011 01:59:41 - 1.3665 +++ rpm/CHANGES 29 Jul 2011 04:26:06 - 1.3666 @@ -1,7 +1,8 @@ HEAD: +- proyvind: add sparc64v2 arch to %sparcx. - proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND - 64 bit archs + 64 bit archs. - proyvind: add armv7l to %arm (from Paulo Andrade p...@mandriva.com.br). - proyvind: fix rpm not comparing distepoch if missing from one package when doing comparision. @@ . patch -p0 '@@ .' Index: rpm/macros/macros.rpmbuild.in $ cvs diff -u -r1.11 -r1.12 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:59:41 - 1.11 +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:26:06 - 1.12 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.11 2011/07/29 01:59:41 pkarlsen Exp $ +# $Id: macros.rpmbuild.in,v 1.12 2011/07/29 04:26:06 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -643,7 +643,7 @@ %sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v sparcv9v2 # add alternative sparc architectures macro (bugzilla #455972 patch) -%sparcx %sparc sparc64 sparc64v +%sparcx %sparc sparc64 sparc64v sparc64v2 # also for mips %mips mips mips2 mips3 mips4 octeon @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 29-Jul-2011 06:27:50 Branch: rpm-5_3 Handle: 2011072904274901 Modified files: (Branch: rpm-5_3) rpm CHANGES rpm/macros macros.rpmbuild.in Log: add sparc64v2 arch to %sparcx Summary: RevisionChanges Path 1.3296.2.248+2 -1 rpm/CHANGES 1.4.2.7 +2 -2 rpm/macros/macros.rpmbuild.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.247 -r1.3296.2.248 CHANGES --- rpm/CHANGES 29 Jul 2011 04:16:06 - 1.3296.2.247 +++ rpm/CHANGES 29 Jul 2011 04:27:49 - 1.3296.2.248 @@ -1,7 +1,8 @@ 5.3.12 - 5.3.13 +- proyvind: add sparc64v2 arch to %sparcx. - proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND - 64 bit archs + 64 bit archs. - proyvind: add armv7l to %arm (from Paulo Andrade p...@mandriva.com.br). - proyvind: fix rpm not comparing distepoch if missing from one package when doing comparision. @@ . patch -p0 '@@ .' Index: rpm/macros/macros.rpmbuild.in $ cvs diff -u -r1.4.2.6 -r1.4.2.7 macros.rpmbuild.in --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:16:06 - 1.4.2.6 +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:27:50 - 1.4.2.7 @@ -1,7 +1,7 @@ #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild # \verbatim # -# $Id: macros.rpmbuild.in,v 1.4.2.6 2011/07/29 04:16:06 pkarlsen Exp $ +# $Id: macros.rpmbuild.in,v 1.4.2.7 2011/07/29 04:27:50 pkarlsen Exp $ # # This file contains rpmbuild configuration macros. # @@ -642,7 +642,7 @@ %sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v sparcv9v2 # add alternative sparc architectures macro (bugzilla #455972 patch) -%sparcx %sparc sparc64 sparc64v +%sparcx %sparc sparc64 sparc64v sparc64v2 # also for mips %mips mips mips2 mips3 mips4 octeon @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 27-Jul-2011 19:48:29
Branch: HEAD Handle: 2011072717482900
Modified files:
rpm/tools dbconvert.c
Log:
fix help text
Summary:
RevisionChanges Path
2.8 +2 -2 rpm/tools/dbconvert.c
patch -p0 '@@ .'
Index: rpm/tools/dbconvert.c
$ cvs diff -u -r2.7 -r2.8 dbconvert.c
--- rpm/tools/dbconvert.c 6 Jul 2011 12:55:30 - 2.7
+++ rpm/tools/dbconvert.c 27 Jul 2011 17:48:29 - 2.8
@@ -414,9 +414,9 @@
rpm root path, path},
{ btree, 'b', POPT_ARG_VAL, dbType, 0,
- swap indexes to big endian, NULL},
+ convert database type to btree, NULL},
{ hash, 'h', POPT_ARG_VAL, dbType, 1,
- swap indexes to little endian, NULL},
+ convert database type to hash, NULL},
{ bigendian, 'B', POPT_ARG_VAL, byteOrder, 1,
swap indexes to big endian, NULL},
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 27-Jul-2011 19:58:12
Branch: rpm-5_4 Handle: 2011072717581200
Modified files: (Branch: rpm-5_4)
rpm/tools dbconvert.c
Log:
fix help text
Summary:
RevisionChanges Path
2.1.2.9 +2 -2 rpm/tools/dbconvert.c
patch -p0 '@@ .'
Index: rpm/tools/dbconvert.c
$ cvs diff -u -r2.1.2.8 -r2.1.2.9 dbconvert.c
--- rpm/tools/dbconvert.c 6 Jul 2011 13:03:42 - 2.1.2.8
+++ rpm/tools/dbconvert.c 27 Jul 2011 17:58:12 - 2.1.2.9
@@ -376,9 +376,9 @@
rpm root path, path },
{ btree, 'b', POPT_ARG_VAL, dbType, 0,
- swap indexes to big endian, NULL },
+ convert database type to btree, NULL},
{ hash, 'h', POPT_ARG_VAL, dbType, 1,
- swap indexes to little endian, NULL },
+ convert database type to hash, NULL},
{ bigendian, 'B', POPT_ARG_VAL, byteOrder, 1,
swap indexes to big endian, NULL },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 27-Jul-2011 20:00:25
Branch: rpm-5_3 Handle: 2011072718002500
Modified files: (Branch: rpm-5_3)
rpm/tools dbconvert.c
Log:
fix help text
Summary:
RevisionChanges Path
2.1.4.8 +2 -2 rpm/tools/dbconvert.c
patch -p0 '@@ .'
Index: rpm/tools/dbconvert.c
$ cvs diff -u -r2.1.4.7 -r2.1.4.8 dbconvert.c
--- rpm/tools/dbconvert.c 6 Jul 2011 13:03:01 - 2.1.4.7
+++ rpm/tools/dbconvert.c 27 Jul 2011 18:00:25 - 2.1.4.8
@@ -374,9 +374,9 @@
rpm root path, path },
{ btree, 'b', POPT_ARG_VAL, dbType, 0,
- swap indexes to big endian, NULL },
+ convert database type to btree, NULL},
{ hash, 'h', POPT_ARG_VAL, dbType, 1,
- swap indexes to little endian, NULL },
+ convert database type to hash, NULL},
{ bigendian, 'B', POPT_ARG_VAL, byteOrder, 1,
swap indexes to big endian, NULL },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 27-Jul-2011 20:02:02 Branch: rpm-5_4 Handle: 2011072718020200 Modified files: (Branch: rpm-5_4) rpm/tools dbconvert.c Log: add a missing null pointer check Summary: RevisionChanges Path 2.1.2.10+1 -1 rpm/tools/dbconvert.c patch -p0 '@@ .' Index: rpm/tools/dbconvert.c $ cvs diff -u -r2.1.2.9 -r2.1.2.10 dbconvert.c --- rpm/tools/dbconvert.c 27 Jul 2011 17:58:12 - 2.1.2.9 +++ rpm/tools/dbconvert.c 27 Jul 2011 18:02:02 - 2.1.2.10 @@ -332,7 +332,7 @@ fn = _free(fn); /* clear locks */ - fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL); + fn = rpmGetPath(prefix prefix[0] ? prefix : , dbpath, /, __db.*, NULL); xx = Glob(fn, 0, NULL, gl); for (i = 0; i (int)gl.gl_pathc; i++) xx = Unlink(gl.gl_pathv[i]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/macros/ python.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 17-Jul-2011 00:30:40
Branch: HEAD Handle: 2011071622303900
Modified files:
rpm/macros python.in
Log:
fix %py_dyndir to use %py_platlibdir
Summary:
RevisionChanges Path
1.9 +1 -1 rpm/macros/python.in
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.8 -r1.9 python.in
--- rpm/macros/python.in 10 Apr 2011 11:19:24 - 1.8
+++ rpm/macros/python.in 16 Jul 2011 22:30:39 - 1.9
@@ -27,7 +27,7 @@
%py_puresitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib()' 2/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
%py_sitedir %py_puresitedir
-%py_dyndir %{py_libdir}/lib-dynload
+%py_dyndir %{py_platlibdir}/lib-dynload
%py_incdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_inc()' 2/dev/null || echo
PYTHON-INCLUDEDIR-NOT-FOUND)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/macros/ python.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 17-Jul-2011 00:31:22
Branch: rpm-5_4 Handle: 2011071622312200
Modified files: (Branch: rpm-5_4)
rpm/macros python.in
Log:
fix %py_dyndir to use %py_platlibdir
Summary:
RevisionChanges Path
1.6.2.3 +1 -1 rpm/macros/python.in
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.6.2.2 -r1.6.2.3 python.in
--- rpm/macros/python.in 10 Apr 2011 11:20:11 - 1.6.2.2
+++ rpm/macros/python.in 16 Jul 2011 22:31:22 - 1.6.2.3
@@ -27,7 +27,7 @@
%py_puresitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib()' 2/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
%py_sitedir %py_puresitedir
-%py_dyndir %{py_libdir}/lib-dynload
+%py_dyndir %{py_platlibdir}/lib-dynload
%py_incdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_inc()' 2/dev/null || echo
PYTHON-INCLUDEDIR-NOT-FOUND)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ python.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 17-Jul-2011 00:31:39
Branch: rpm-5_3 Handle: 2011071622313900
Modified files: (Branch: rpm-5_3)
rpm/macros python.in
Log:
fix %py_dyndir to use %py_platlibdir
Summary:
RevisionChanges Path
1.3.2.3 +1 -1 rpm/macros/python.in
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.3.2.2 -r1.3.2.3 python.in
--- rpm/macros/python.in 10 Apr 2011 11:20:52 - 1.3.2.2
+++ rpm/macros/python.in 16 Jul 2011 22:31:39 - 1.3.2.3
@@ -27,7 +27,7 @@
%py_puresitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib()' 2/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
%py_sitedir %py_puresitedir
-%py_dyndir %{py_libdir}/lib-dynload
+%py_dyndir %{py_platlibdir}/lib-dynload
%py_incdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_inc()' 2/dev/null || echo
PYTHON-INCLUDEDIR-NOT-FOUND)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 13-Jul-2011 16:49:50 Branch: HEAD Handle: 2011071314494901 Modified files: rpm/lib rpmds.c rpm/rpmdb rpmevr.c Log: fix regression introduced in previous commit Summary: RevisionChanges Path 2.181 +4 -3 rpm/lib/rpmds.c 1.41+4 -3 rpm/rpmdb/rpmevr.c patch -p0 '@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.180 -r2.181 rpmds.c --- rpm/lib/rpmds.c 12 Jul 2011 10:41:18 - 2.180 +++ rpm/lib/rpmds.c 13 Jul 2011 14:49:49 - 2.181 @@ -4065,9 +4065,10 @@ case 'D':ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) - *(b-F[ix]) == '\0') - break; + if(ix = RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + !(ix == RPMEVR_D (bFlags RPMSENSE_LESS)) + *(b-F[ix]) == '\0') + break; if (a-F[ix] b-F[ix]) #else if (a-F[ix] *a-F[ix] b-F[ix] *b-F[ix]) @@ . patch -p0 '@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.40 -r1.41 rpmevr.c --- rpm/rpmdb/rpmevr.c12 Jul 2011 10:41:19 - 1.40 +++ rpm/rpmdb/rpmevr.c13 Jul 2011 14:49:50 - 1.41 @@ -286,9 +286,10 @@ case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) - *(b-F[ix]) == '\0') - break; + if(ix = RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + !(ix == RPMEVR_D (b-Flags RPMSENSE_LESS)) + *(b-F[ix]) == '\0') + break; #endif rc = compare_values(a-F[ix], b-F[ix]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 13-Jul-2011 16:50:07 Branch: rpm-5_4 Handle: 2011071314500601 Modified files: (Branch: rpm-5_4) rpm/lib rpmds.c rpm/rpmdb rpmevr.c Log: fix regression introduced in previous commit Summary: RevisionChanges Path 2.170.2.11 +4 -3 rpm/lib/rpmds.c 1.37.2.4+4 -3 rpm/rpmdb/rpmevr.c patch -p0 '@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.170.2.10 -r2.170.2.11 rpmds.c --- rpm/lib/rpmds.c 12 Jul 2011 10:44:05 - 2.170.2.10 +++ rpm/lib/rpmds.c 13 Jul 2011 14:50:06 - 2.170.2.11 @@ -4065,9 +4065,10 @@ case 'D':ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) - *(b-F[ix]) == '\0') - break; + if(ix = RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + !(ix == RPMEVR_D (bFlags RPMSENSE_LESS)) + *(b-F[ix]) == '\0') + break; if (a-F[ix] b-F[ix]) #else if (a-F[ix] *a-F[ix] b-F[ix] *b-F[ix]) @@ . patch -p0 '@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.37.2.3 -r1.37.2.4 rpmevr.c --- rpm/rpmdb/rpmevr.c12 Jul 2011 10:44:05 - 1.37.2.3 +++ rpm/rpmdb/rpmevr.c13 Jul 2011 14:50:07 - 1.37.2.4 @@ -286,9 +286,10 @@ case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) - *(b-F[ix]) == '\0') - break; + if(ix = RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + !(ix == RPMEVR_D (b-Flags RPMSENSE_LESS)) + *(b-F[ix]) == '\0') + break; #endif rc = compare_values(a-F[ix], b-F[ix]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 13-Jul-2011 16:50:20 Branch: rpm-5_3 Handle: 2011071314502000 Modified files: (Branch: rpm-5_3) rpm/lib rpmds.c rpm/rpmdb rpmevr.c Log: fix regression introduced in previous commit Summary: RevisionChanges Path 2.167.2.17 +4 -3 rpm/lib/rpmds.c 1.36.2.5+4 -3 rpm/rpmdb/rpmevr.c patch -p0 '@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.167.2.16 -r2.167.2.17 rpmds.c --- rpm/lib/rpmds.c 12 Jul 2011 10:45:03 - 2.167.2.16 +++ rpm/lib/rpmds.c 13 Jul 2011 14:50:20 - 2.167.2.17 @@ -4333,9 +4333,10 @@ case 'D':ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) - *(b-F[ix]) == '\0') - break; + if(ix = RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + !(ix == RPMEVR_D (bFlags RPMSENSE_LESS)) + *(b-F[ix]) == '\0') + break; if (a-F[ix] b-F[ix]) #else if (a-F[ix] *a-F[ix] b-F[ix] *b-F[ix]) @@ . patch -p0 '@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.36.2.4 -r1.36.2.5 rpmevr.c --- rpm/rpmdb/rpmevr.c12 Jul 2011 10:45:04 - 1.36.2.4 +++ rpm/rpmdb/rpmevr.c13 Jul 2011 14:50:20 - 1.36.2.5 @@ -286,9 +286,10 @@ case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix == RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) - *(b-F[ix]) == '\0') - break; + if(ix = RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + !(ix == RPMEVR_D (b-Flags RPMSENSE_LESS)) + *(b-F[ix]) == '\0') + break; #endif rc = compare_values(a-F[ix], b-F[ix]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 12-Jul-2011 12:44:06 Branch: rpm-5_4 Handle: 2011071210440501 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/lib rpmds.c rpm/rpmdb rpmevr.c Log: fix rpm not comparing distepoch if missing from one package when doing comparision. Summary: RevisionChanges Path 1.3501.2.147+2 -0 rpm/CHANGES 2.170.2.10 +1 -1 rpm/lib/rpmds.c 1.37.2.3+1 -1 rpm/rpmdb/rpmevr.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.146 -r1.3501.2.147 CHANGES --- rpm/CHANGES 12 Jul 2011 10:42:58 - 1.3501.2.146 +++ rpm/CHANGES 12 Jul 2011 10:44:06 - 1.3501.2.147 @@ -1,4 +1,6 @@ 5.4.1 - 5.4.2 +- proyvind: fix rpm not comparing distepoch if missing from one package + when doing comparision. - proyvind: fix rpm treating packages of same NVRA, but different distepoch as equal, preventing upgrades between them. - proyvind: dbconvert: fix segfault when no root is specified. @@ . patch -p0 '@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.170.2.9 -r2.170.2.10 rpmds.c --- rpm/lib/rpmds.c 11 Apr 2011 05:09:55 - 2.170.2.9 +++ rpm/lib/rpmds.c 12 Jul 2011 10:44:05 - 2.170.2.10 @@ -4065,7 +4065,7 @@ case 'D':ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix = RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + if(ix == RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) *(b-F[ix]) == '\0') break; if (a-F[ix] b-F[ix]) @@ . patch -p0 '@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.37.2.2 -r1.37.2.3 rpmevr.c --- rpm/rpmdb/rpmevr.c20 Apr 2011 15:57:00 - 1.37.2.2 +++ rpm/rpmdb/rpmevr.c12 Jul 2011 10:44:05 - 1.37.2.3 @@ -286,7 +286,7 @@ case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix = RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + if(ix == RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) *(b-F[ix]) == '\0') break; #endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/macros/ mandriva.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 12-Jul-2011 12:44:19
Branch: rpm-5_4 Handle: 2011071210441900
Modified files: (Branch: rpm-5_4)
rpm/macros mandriva.in
Log:
change dependency loop errors to warnings
Summary:
RevisionChanges Path
1.7.2.10+2 -2 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.7.2.9 -r1.7.2.10 mandriva.in
--- rpm/macros/mandriva.in4 May 2011 12:19:54 - 1.7.2.9
+++ rpm/macros/mandriva.in12 Jul 2011 10:44:19 - 1.7.2.10
@@ -75,9 +75,9 @@
%__xar %{_bindir}/xar
# mdvbz#61851
-%__tar_wildcards --wildcards
+%__tar_wildcards --wildcards
-%_loop_detection_loglevel 3
+%_loop_detection_loglevel 4
# mdvbz#62741
# standard systemd directories
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 12-Jul-2011 12:45:07 Branch: rpm-5_3 Handle: 2011071210450302 Modified files: (Branch: rpm-5_3) rpm CHANGES rpm/lib rpmds.c rpm/rpmdb rpmevr.c Log: fix rpm not comparing distepoch if missing from one package when doing comparision. Summary: RevisionChanges Path 1.3296.2.244+2 -0 rpm/CHANGES 2.167.2.16 +1 -1 rpm/lib/rpmds.c 1.36.2.4+1 -1 rpm/rpmdb/rpmevr.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.243 -r1.3296.2.244 CHANGES --- rpm/CHANGES 12 Jul 2011 10:44:41 - 1.3296.2.243 +++ rpm/CHANGES 12 Jul 2011 10:45:05 - 1.3296.2.244 @@ -1,4 +1,6 @@ 5.3.12 - 5.3.13 +- proyvind: fix rpm not comparing distepoch if missing from one package + when doing comparision. - proyvind: fix rpm treating packages of same NVRA, but different distepoch as equal, preventing upgrades between them. - proyvind: dbconvert: fix segfault when no root is specified. @@ . patch -p0 '@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.167.2.15 -r2.167.2.16 rpmds.c --- rpm/lib/rpmds.c 28 Apr 2011 15:49:04 - 2.167.2.15 +++ rpm/lib/rpmds.c 12 Jul 2011 10:45:03 - 2.167.2.16 @@ -4333,7 +4333,7 @@ case 'D':ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix = RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + if(ix == RPMEVR_R (bFlags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) *(b-F[ix]) == '\0') break; if (a-F[ix] b-F[ix]) @@ . patch -p0 '@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.36.2.3 -r1.36.2.4 rpmevr.c --- rpm/rpmdb/rpmevr.c20 Apr 2011 16:17:09 - 1.36.2.3 +++ rpm/rpmdb/rpmevr.c12 Jul 2011 10:45:04 - 1.36.2.4 @@ -286,7 +286,7 @@ case 'D': ix = RPMEVR_D; /*@switchbreak@*/break; } #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */ - if(ix = RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) + if(ix == RPMEVR_R (b-Flags (~RPMSENSE_GREATER RPMSENSE_EQUAL)) *(b-F[ix]) == '\0') break; #endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 12-Jul-2011 12:45:17
Branch: rpm-5_3 Handle: 2011071210451600
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
change dependency loop errors to warnings
Summary:
RevisionChanges Path
1.1.2.19+2 -2 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.18 -r1.1.2.19 mandriva.in
--- rpm/macros/mandriva.in4 May 2011 12:20:06 - 1.1.2.18
+++ rpm/macros/mandriva.in12 Jul 2011 10:45:16 - 1.1.2.19
@@ -75,9 +75,9 @@
%__xar %{_bindir}/xar
# mdvbz#61851
-%__tar_wildcards --wildcards
+%__tar_wildcards --wildcards
-%_loop_detection_loglevel 3
+%_loop_detection_loglevel 4
# mdvbz#62741
# standard systemd directories
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 06-Jul-2011 11:30:13 Branch: HEAD Handle: 2011070609301200 Modified files: rpm/scripts Makefile.am Log: be sure to install gem_helper.rb gstreamer.sh scripts Summary: RevisionChanges Path 1.83+2 -2 rpm/scripts/Makefile.am patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.82 -r1.83 Makefile.am --- rpm/scripts/Makefile.am 7 Jun 2011 13:30:14 - 1.82 +++ rpm/scripts/Makefile.am 6 Jul 2011 09:30:12 - 1.83 @@ -55,8 +55,8 @@ check-files cross-build dbconvert.sh executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ find-provides.perl \ - find-requires.perl getpo.sh http.req \ - kmod-deps.sh javadeps.sh libtooldeps.sh \ + find-requires.perl gem_helper.rb getpo.sh http.req \ + kmod-deps.sh gstreamer.sh javadeps.sh libtooldeps.sh \ mono-find-provides mono-find-requires \ check-multiarch-files mkmultiarch \ osgideps.pl pkgconfigdeps.sh \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/scripts/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 06-Jul-2011 11:32:40 Branch: rpm-5_4 Handle: 2011070609324000 Modified files: (Branch: rpm-5_4) rpm/scripts Makefile.am Log: be sure to install gem_helper.rb gstreamer.sh scripts Summary: RevisionChanges Path 1.75.2.9+2 -2 rpm/scripts/Makefile.am patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.75.2.8 -r1.75.2.9 Makefile.am --- rpm/scripts/Makefile.am 7 Jun 2011 13:31:17 - 1.75.2.8 +++ rpm/scripts/Makefile.am 6 Jul 2011 09:32:40 - 1.75.2.9 @@ -55,8 +55,8 @@ check-files cross-build dbconvert.sh executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ find-provides.perl \ - find-requires.perl getpo.sh http.req \ - kmod-deps.sh javadeps.sh libtooldeps.sh \ + find-requires.perl gem_helper.rb getpo.sh http.req \ + kmod-deps.sh gstreamer.sh javadeps.sh libtooldeps.sh \ mono-find-provides mono-find-requires \ check-multiarch-files mkmultiarch \ osgideps.pl pkgconfigdeps.sh \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/scripts/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 06-Jul-2011 11:33:54 Branch: rpm-5_3 Handle: 2011070609335400 Modified files: (Branch: rpm-5_3) rpm/scripts Makefile.am Log: be sure to install gstreamer.sh script Summary: RevisionChanges Path 1.65.2.13 +2 -2 rpm/scripts/Makefile.am patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.65.2.12 -r1.65.2.13 Makefile.am --- rpm/scripts/Makefile.am 28 Jun 2011 12:05:32 - 1.65.2.12 +++ rpm/scripts/Makefile.am 6 Jul 2011 09:33:54 - 1.65.2.13 @@ -15,7 +15,7 @@ deb_control deb_md5sums deb_postinst deb_postrm deb_preinst deb_prerm \ executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ - find-provides.ksyms find-requires.ksyms kmod-deps.sh kmodtool \ + find-provides.ksyms find-requires.ksyms kmodtool kmod-deps.sh \ cpanflute cpanflute2 Specfile.pm find-provides.perl \ find-requires.perl freshen.sh gendiff gem_helper.rb getpo.sh http.req \ check-java-closure.sh java.prov.sh java.req.sh \ @@ -55,7 +55,7 @@ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ find-provides.perl \ find-requires.perl gem_helper.rb getpo.sh http.req \ - kmod-deps.sh javadeps.sh libtooldeps.sh \ + kmod-deps.sh gstreamer.sh javadeps.sh libtooldeps.sh \ mono-find-provides mono-find-requires \ check-multiarch-files mkmultiarch \ osgideps.pl pkgconfigdeps.sh \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 06-Jul-2011 14:55:30 Branch: HEAD Handle: 2011070612552901 Modified files: rpm CHANGES rpm/tools dbconvert.c Log: dbconvert: fix segfault when no root is specified. Summary: RevisionChanges Path 1.3660 +1 -0 rpm/CHANGES 2.7 +2 -2 rpm/tools/dbconvert.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3659 -r1.3660 CHANGES --- rpm/CHANGES 28 Jun 2011 12:00:19 - 1.3659 +++ rpm/CHANGES 6 Jul 2011 12:55:29 - 1.3660 @@ -1,4 +1,5 @@ HEAD: +- proyvind: dbconvert: fix segfault when no root is specified. - proyvind: check-multiarch-files: remove unnecessary import of MDK::Common, causing undesired dependency from perl dependency generator. - devzero2000: add a simple usage command to devtool @@ . patch -p0 '@@ .' Index: rpm/tools/dbconvert.c $ cvs diff -u -r2.6 -r2.7 dbconvert.c --- rpm/tools/dbconvert.c 11 May 2011 07:55:06 - 2.6 +++ rpm/tools/dbconvert.c 6 Jul 2011 12:55:30 - 2.7 @@ -114,7 +114,7 @@ create mpool txn thread thread_count=64 nofsync, -1); /* (ugly) clear any existing locks */ -fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL); +fn = rpmGetPath(prefix prefix[0] ? prefix : , dbpath, /, __db.*, NULL); xx = Glob(fn, 0, NULL, gl); for (i = 0; i (int) gl.gl_pathc; i++) xx = Unlink(gl.gl_pathv[i]); @@ -377,7 +377,7 @@ fn = _free(fn); /* clear locks */ -fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL); +fn = rpmGetPath(prefix prefix[0] ? prefix : , dbpath, /, __db.*, NULL); xx = Glob(fn, 0, NULL, gl); for (i = 0; i (int) gl.gl_pathc; i++) xx = Unlink(gl.gl_pathv[i]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 06-Jul-2011 14:56:52
Branch: rpm-5_4 Handle: 2011070612565101
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/tools dbconvert.c
Log:
dbconvert: fix segfault when no root is specified.
Summary:
RevisionChanges Path
1.3501.2.145+1 -0 rpm/CHANGES
2.1.2.7 +2 -2 rpm/tools/dbconvert.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.144 -r1.3501.2.145 CHANGES
--- rpm/CHANGES 28 Jun 2011 12:26:10 - 1.3501.2.144
+++ rpm/CHANGES 6 Jul 2011 12:56:51 - 1.3501.2.145
@@ -1,4 +1,5 @@
5.4.1 - 5.4.2
+- proyvind: dbconvert: fix segfault when no root is specified.
- devzero2000: merge afb patch portability of endian
- proyvind: check-multiarch-files: remove unnecessary import of
MDK::Common,
causing undesired dependency from perl dependency generator.
@@ .
patch -p0 '@@ .'
Index: rpm/tools/dbconvert.c
$ cvs diff -u -r2.1.2.6 -r2.1.2.7 dbconvert.c
--- rpm/tools/dbconvert.c 28 Jun 2011 12:26:11 - 2.1.2.6
+++ rpm/tools/dbconvert.c 6 Jul 2011 12:56:52 - 2.1.2.7
@@ -82,7 +82,7 @@
addMacro(NULL, __dbi_txn, NULL, create mpool txn thread thread_count=64
nofsync, -1);
/* (ugly) clear any existing locks */
- fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL);
+ fn = rpmGetPath(prefix prefix[0] ? prefix : , dbpath, /, __db.*,
NULL);
xx = Glob(fn, 0, NULL, gl);
for (i = 0; i (int)gl.gl_pathc; i++)
xx = Unlink(gl.gl_pathv[i]);
@@ -90,7 +90,7 @@
Globfree(gl);
tsCur = rpmtsCreate();
- rpmtsSetRootDir(tsCur, prefix prefix[0] ? prefix : NULL);
+ rpmtsSetRootDir(tsCur, prefix prefix prefix[0] ? prefix : NULL);
if(!rpmtsOpenDB(tsCur, O_RDONLY)) {
if(dbtype == 1) {
addMacro(NULL, _dbi_tags, NULL,
Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Depends:Pubkeys,
-1);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 06-Jul-2011 14:58:04 Branch: rpm-5_3 Handle: 2011070612580301 Modified files: (Branch: rpm-5_3) rpm CHANGES rpm/tools dbconvert.c Log: dbconvert: fix segfault when no root is specified. Summary: RevisionChanges Path 1.3296.2.242+1 -0 rpm/CHANGES 2.1.4.6 +2 -2 rpm/tools/dbconvert.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.241 -r1.3296.2.242 CHANGES --- rpm/CHANGES 28 Jun 2011 12:31:11 - 1.3296.2.241 +++ rpm/CHANGES 6 Jul 2011 12:58:03 - 1.3296.2.242 @@ -1,4 +1,5 @@ 5.3.12 - 5.3.13 +- proyvind: dbconvert: fix segfault when no root is specified. - devzero2000: merge afb patch portability of endian - proyvind: check-multiarch-files: remove unnecessary import of MDK::Common, causing undesired dependency from perl dependency generator. @@ . patch -p0 '@@ .' Index: rpm/tools/dbconvert.c $ cvs diff -u -r2.1.4.5 -r2.1.4.6 dbconvert.c --- rpm/tools/dbconvert.c 28 Jun 2011 12:31:12 - 2.1.4.5 +++ rpm/tools/dbconvert.c 6 Jul 2011 12:58:04 - 2.1.4.6 @@ -82,7 +82,7 @@ addMacro(NULL, __dbi_txn, NULL, create mpool txn thread thread_count=64 nofsync, -1); /* (ugly) clear any existing locks */ - fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL); + fn = rpmGetPath(prefix prefix[0] ? prefix : , dbpath, /, __db.*, NULL); xx = Glob(fn, 0, NULL, gl); for (i = 0; i (int)gl.gl_pathc; i++) xx = Unlink(gl.gl_pathv[i]); @@ -331,7 +331,7 @@ fn = _free(fn); /* clear locks */ - fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL); + fn = rpmGetPath(prefix prefix[0] ? prefix : , dbpath, /, __db.*, NULL); xx = Glob(fn, 0, NULL, gl); for (i = 0; i (int)gl.gl_pathc; i++) xx = Unlink(gl.gl_pathv[i]); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 06-Jul-2011 15:03:01 Branch: rpm-5_3 Handle: 2011070613030100 Modified files: (Branch: rpm-5_3) rpm/tools dbconvert.c Log: fix header inclusion Summary: RevisionChanges Path 2.1.4.7 +12 -13 rpm/tools/dbconvert.c patch -p0 '@@ .' Index: rpm/tools/dbconvert.c $ cvs diff -u -r2.1.4.6 -r2.1.4.7 dbconvert.c --- rpm/tools/dbconvert.c 6 Jul 2011 12:58:04 - 2.1.4.6 +++ rpm/tools/dbconvert.c 6 Jul 2011 13:03:01 - 2.1.4.7 @@ -1,22 +1,21 @@ -#include fcntl.h -#include libintl.h -#include glob.h -#include errno.h -#include stdint.h -#include popt.h +#include system.h -#define _RPMDB_INTERNAL -#define _RPMTAG_INTERNAL -#define WITH_DB +#include poptIO.h -#include argv.h #include rpmio.h -#include rpmtag.h -#include rpmdb.h +#include rpmlog.h #include rpmmacro.h +#include argv.h + +#define _RPMTAG_INTERNAL +#define _RPMDB_INTERNAL +#include rpmdb.h + #include rpmts.h -#include rpmlog.h +#include rpmrc.h + +#include debug.h #ifdef HAVE_SYS_ENDIAN_H #include sys/endian.h @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/scripts/ check-multiarch-files
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 28-Jun-2011 14:00:20 Branch: HEAD Handle: 2011062812001900 Modified files: rpm CHANGES rpm/scripts check-multiarch-files Log: check-multiarch-files: remove unnecessary import of MDK::Common, causing undesired dependency from perl dependency generator. Summary: RevisionChanges Path 1.3659 +2 -0 rpm/CHANGES 1.2 +0 -1 rpm/scripts/check-multiarch-files patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3658 -r1.3659 CHANGES --- rpm/CHANGES 20 Jun 2011 14:45:43 - 1.3658 +++ rpm/CHANGES 28 Jun 2011 12:00:19 - 1.3659 @@ -1,4 +1,6 @@ HEAD: +- proyvind: check-multiarch-files: remove unnecessary import of MDK::Common, + causing undesired dependency from perl dependency generator. - devzero2000: add a simple usage command to devtool - proyvind: fix broken %optflags for i686-linux macros. - proyvind: mandriva: fix implicit %clean not being run when %changelog is @@ . patch -p0 '@@ .' Index: rpm/scripts/check-multiarch-files $ cvs diff -u -r1.1 -r1.2 check-multiarch-files --- rpm/scripts/check-multiarch-files 10 Apr 2011 13:50:28 - 1.1 +++ rpm/scripts/check-multiarch-files 28 Jun 2011 12:00:19 - 1.2 @@ -5,7 +5,6 @@ #--- use strict; -use MDK::Common; my $RPM_BUILD_ROOT = (shift); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/scripts/ check-multiarch-files
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 28-Jun-2011 14:03:35 Branch: rpm-5_3 Handle: 2011062812033401 Modified files: (Branch: rpm-5_3) rpm CHANGES rpm/scripts check-multiarch-files Log: check-multiarch-files: remove unnecessary import of MDK::Common, causing undesired dependency from perl dependency generator. Summary: RevisionChanges Path 1.3296.2.240+2 -0 rpm/CHANGES 1.1.4.3 +0 -1 rpm/scripts/check-multiarch-files patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.239 -r1.3296.2.240 CHANGES --- rpm/CHANGES 16 Jun 2011 08:31:30 - 1.3296.2.239 +++ rpm/CHANGES 28 Jun 2011 12:03:34 - 1.3296.2.240 @@ -1,4 +1,6 @@ 5.3.12 - 5.3.13 +- proyvind: check-multiarch-files: remove unnecessary import of MDK::Common, + causing undesired dependency from perl dependency generator. - proyvind: fix broken %optflags for i686-linux macros. - proyvind: mandriva: fix implicit %clean not being run when %changelog is present. @@ . patch -p0 '@@ .' Index: rpm/scripts/check-multiarch-files $ cvs diff -u -r1.1.4.2 -r1.1.4.3 check-multiarch-files --- rpm/scripts/check-multiarch-files 10 Apr 2011 13:54:19 - 1.1.4.2 +++ rpm/scripts/check-multiarch-files 28 Jun 2011 12:03:35 - 1.1.4.3 @@ -5,7 +5,6 @@ #--- use strict; -use MDK::Common; my $RPM_BUILD_ROOT = (shift); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/rpmdb/ fprint.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 07-Jun-2011 15:17:20
Branch: rpm-5_3 Handle: 2011060713171901
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/rpmdb fprint.c
Log:
data returned by hash should be of type struct rpmffi_s **i instead of
struct rpmffi_s * to avoid segfault. Patch by Qing He.
Summary:
RevisionChanges Path
1.3296.2.237+3 -0 rpm/CHANGES
1.40.2.1+3 -3 rpm/rpmdb/fprint.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.236 -r1.3296.2.237 CHANGES
--- rpm/CHANGES 7 Jun 2011 13:13:30 - 1.3296.2.236
+++ rpm/CHANGES 7 Jun 2011 13:17:19 - 1.3296.2.237
@@ -1,4 +1,7 @@
5.3.12 - 5.3.13
+- devzero2000: In fpLookupSubdir, data returned by hash should be of type
+ struct rpmffi_s ** instead of struct rpmffi_s * to avoid
+ segfault. Patch by Qing He.
- proyvind: don't pick up python version from python egg, rely on path
only in stead to avoid incorrect version dependencies if any other
egg metadata for other versions is found.
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/fprint.c
$ cvs diff -u -r1.40 -r1.40.2.1 fprint.c
--- rpm/rpmdb/fprint.c6 Mar 2010 16:20:46 - 1.40
+++ rpm/rpmdb/fprint.c7 Jun 2011 13:17:20 - 1.40.2.1
@@ -333,7 +333,7 @@
*te = '\0';
while (te se) {
- struct rpmffi_s * recs;
+ struct rpmffi_s ** recs;
int numRecs;
int i;
@@ -346,8 +346,8 @@
const char * link;
int fx;
- fx = recs[i].fileno;
- fi = recs[i].p-fi;
+ fx = recs[i]-fileno;
+ fi = recs[i]-p-fi;
flink = fi-flinks[fx];
if (!(flink *flink != '\0'))
continue;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/build/ parseChangelog.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 07-Jun-2011 18:33:25
Branch: rpm-5_4 Handle: 2011060716332401
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/build parseChangelog.c
Log:
fix implicit %clean not being run when %changelog is present.
Summary:
RevisionChanges Path
1.3501.2.138+2 -0 rpm/CHANGES
2.50.6.1+8 -0 rpm/build/parseChangelog.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.137 -r1.3501.2.138 CHANGES
--- rpm/CHANGES 7 Jun 2011 15:37:38 - 1.3501.2.137
+++ rpm/CHANGES 7 Jun 2011 16:33:24 - 1.3501.2.138
@@ -1,4 +1,6 @@
5.4.1 - 5.4.2
+- proyvind: mandriva: fix implicit %clean not being run when %changelog
is
+ present.
- proyvind: don't pick up python version from python egg, rely on path
only in stead to avoid incorrect version dependencies if any other
egg metadata for other versions is found.
@@ .
patch -p0 '@@ .'
Index: rpm/build/parseChangelog.c
$ cvs diff -u -r2.50 -r2.50.6.1 parseChangelog.c
--- rpm/build/parseChangelog.c18 Jan 2009 17:19:58 - 2.50
+++ rpm/build/parseChangelog.c7 Jun 2011 16:33:25 - 2.50.6.1
@@ -269,7 +269,11 @@
/* There are no options to %changelog */
if ((rc = readLine(spec, STRIP_COMMENTS)) 0) {
iob = rpmiobFree(iob);
+#if defined(RPM_VENDOR_MANDRIVA)
+ return (spec-clean == NULL) ? PART_CLEAN : PART_NONE;
+#else
return PART_NONE;
+#endif
}
if (rc != RPMRC_OK)
return rc;
@@ -281,7 +285,11 @@
iob = rpmiobAppend(iob, spec-line, 0);
line = _free(line);
if ((rc = readLine(spec, STRIP_COMMENTS | STRIP_NOEXPAND)) 0) {
+#if defined(RPM_VENDOR_MANDRIVA)
+ nextPart = (spec-clean == NULL) ? PART_CLEAN : PART_NONE;
+#else
nextPart = PART_NONE;
+#endif
break;
}
if (rc != RPMRC_OK)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/rpmdb/ rpmdb.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 27-May-2011 16:50:27
Branch: rpm-5_3 Handle: 2011052714502700
Modified files: (Branch: rpm-5_3)
rpm/rpmdb rpmdb.c
Log:
come up with a better hack for querying nvra with disttag/distepoch
that should be rather generic
Summary:
RevisionChanges Path
1.386.2.12 +80 -12 rpm/rpmdb/rpmdb.c
patch -p0 '@@ .'
Index: rpm/rpmdb/rpmdb.c
$ cvs diff -u -r1.386.2.11 -r1.386.2.12 rpmdb.c
--- rpm/rpmdb/rpmdb.c 24 Mar 2011 16:51:17 - 1.386.2.11
+++ rpm/rpmdb/rpmdb.c 27 May 2011 14:50:27 - 1.386.2.12
@@ -2446,24 +2446,92 @@
/* XXX Special case #4: gather primary keys with patterns. */
rpmRC rc;
+ rc = dbiFindMatches(dbi, keyp, set);
#if defined(RPM_VENDOR_MANDRIVA)
/*
- * ugly hack to workaround disttag/distepoch pattern matching issue to
buy some
+ * Hack to workaround disttag/distepoch pattern matching issue to buy
some
* time to come up with better pattern fix..
+ * One size should fit all now.. ;)
+ *
+ * This patch will try match NVR first, then for all matches returned,
+ * it will match disttag, distepoch arch individually.
*/
- const char *tmp = strstr(keyp, -mdv2011.0);
- if(tmp) {
- const char *origkeyp = keyp;
- size_t klen = strlen(keyp);
- keyp = alloca(klen);
- memset((void*)keyp, klen, 0);
- klen = tmp-origkeyp+1;
- snprintf((char*)keyp, klen, %s, origkeyp);
- if(strlen(tmp) sizeof(-mdv2011.0)-1)
- stpcpy((char*)keyp+(klen-1), tmp[sizeof(-mdv2011.0)-1]);
+
+ /* We'll only try this if query fails */
+ if(!rc ((const char*)keyp)[0] != '^' tag == RPMTAG_NVRA
+ (set == NULL || set-count 1)) {
+ size_t i;
+ char *tmp = (char*)keyp;
+
+ /* If pattern has less than three '-', it can't contain disttag, so
+ * no point in trying */
+ for (i = 0; (tmp = strchr(tmp, '-')); i++, tmp++);
+ if (i = 3) {
+ dbiIndex pdbi;
+ DBC *pdbc;
+ const char *origkeyp = keyp;
+ size_t klen = strlen(keyp)+1;
+ size_t size = 0;
+ int xx;
+
+ keyp = alloca(klen);
+ stpcpy((char*)keyp, origkeyp);
+ tmp = strrchr(keyp, '-');
+ *tmp = '\0';
+ rc = dbiFindMatches(dbi, keyp, set);
+
+ pdbi = dbiOpen(db, RPMDBI_PACKAGES, 0);
+ xx = dbiCopen(pdbi, dbiTxnid(pdbi), pdbc, 0);
+
+ for(i = 0; i set-count; i++) {
+ DBT k = DBT_INIT;
+ DBT v = DBT_INIT;
+ Header h;
+ uint32_t offset = _hton_ui(set-recs[i].hdrNum);
+ rpmTag checkTags[] =
+ { RPMTAG_DISTTAG, RPMTAG_DISTEPOCH, RPMTAG_ARCH };
+ int j;
+
+ memset(k, 0, sizeof(k));
+ memset(v, 0, sizeof(v));
+ k.data = offset;
+ k.size = sizeof(offset);
+
+ xx = dbiGet(dbi, pdbc, k, v, DB_SET);
+ h = headerLoad(v.data);
+ tmp = (char*)((size_t)keyp + strlen(keyp) + 1);
+
+ for (j = 0; j
(int)(sizeof(checkTags)/sizeof(checkTags[0]))
+ *tmp != '\0'; j++) {
+ he-tag = checkTags[j];
+ if(headerGet(h, he, 0)) {
+ size_t len = strlen(he-p.str);
+
+ if (he-tag == RPMTAG_ARCH *tmp == '.')
+ tmp++;
+
+ if(!strncmp(he-p.str, tmp, len))
+ tmp += len;
+ _free(he-p.ptr);
+ }
+ }
+ if(j *tmp == '\0') {
+ set-recs[size].hdrNum = set-recs[i].hdrNum;
+ set-recs[size].tagNum = set-recs[i].tagNum;
+ size++;
+ }
+
+ h = headerFree(h);
+ }
+ if(set-count != size) {
+ set-count = size;
+ set-recs = realloc(set-recs, size * sizeof(*set-recs));
+ }
+
+ xx = dbiCclose(pdbi, pdbc, 0);
[CVS] RPM: rpm-5_4: rpm/lib/ psm.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 25-May-2011 14:51:30
Branch: rpm-5_4 Handle: 2011052512513000
Modified files: (Branch: rpm-5_4)
rpm/lib psm.c
Log:
bring back syslog patch forgotten on rpm-5_2 branch (mdvbz#63318)
Summary:
RevisionChanges Path
2.399.2.2 +22 -0 rpm/lib/psm.c
patch -p0 '@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.399.2.1 -r2.399.2.2 psm.c
--- rpm/lib/psm.c 29 Dec 2010 15:02:49 - 2.399.2.1
+++ rpm/lib/psm.c 25 May 2011 12:51:30 - 2.399.2.2
@@ -3062,6 +3062,17 @@
else
rc = rpmdbAdd(rpmtsGetRdb(ts), tid, fi-h, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
+#if defined(HAVE_SYSLOG_H) defined(RPM_VENDOR_MANDRIVA) /*
log-install-remove-to-syslog */
+ {
+ char *s, fmt;
+ fmt = rpmExpand(%{___NVRA}, NULL);
+ s = headerSprintf(fi-h, fmt,
+ rpmTagTable, rpmHeaderFormats, NULL);
+ syslog(LOG_NOTICE, [RPM] %s installed\n, s);
+ fmt = _free(fmt);
+ s = _free(s);
+ }
+#endif
}
if (rc != RPMRC_OK) {
@@ -3091,6 +3102,17 @@
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi-record, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
+#if defined(HAVE_SYSLOG_H) defined(RPM_VENDOR_MANDRIVA) /*
log-install-remove-to-syslog */
+{
+ char *s, fmt;
+ fmt = rpmExpand(%{___NVRA}, NULL);
+ s = headerSprintf(fi-h, fmt,
+ rpmTagTable, rpmHeaderFormats, NULL);
+ syslog(LOG_NOTICE, [RPM] %s removed\n, s);
+ fmt = _free(fmt);
+ s = _free(s);
+ }
+#endif
if (rc != RPMRC_OK) {
xx = rpmtxnAbort(rpmtsGetRdb(ts)-db_txn);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ psm.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 25-May-2011 14:52:22
Branch: rpm-5_3 Handle: 2011052512522100
Modified files: (Branch: rpm-5_3)
rpm/lib psm.c
Log:
bring back syslog patch forgotten on rpm-5_2 branch (mdvbz#63318)
Summary:
RevisionChanges Path
2.394.2.11 +22 -0 rpm/lib/psm.c
patch -p0 '@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.394.2.10 -r2.394.2.11 psm.c
--- rpm/lib/psm.c 9 Apr 2011 23:02:04 - 2.394.2.10
+++ rpm/lib/psm.c 25 May 2011 12:52:21 - 2.394.2.11
@@ -3070,6 +3070,17 @@
else
rc = rpmdbAdd(rpmtsGetRdb(ts), tid, fi-h, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
+#if defined(HAVE_SYSLOG_H) defined(RPM_VENDOR_MANDRIVA) /*
log-install-remove-to-syslog */
+ {
+ char *s, fmt;
+ fmt = rpmExpand(%{___NVRA}, NULL);
+ s = headerSprintf(fi-h, fmt,
+ rpmTagTable, rpmHeaderFormats, NULL);
+ syslog(LOG_NOTICE, [RPM] %s installed\n, s);
+ fmt = _free(fmt);
+ s = _free(s);
+ }
+#endif
}
if (rc != RPMRC_OK) {
@@ -3099,6 +3110,17 @@
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi-record, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
+#if defined(HAVE_SYSLOG_H) defined(RPM_VENDOR_MANDRIVA) /*
log-install-remove-to-syslog */
+{
+ char *s, fmt;
+ fmt = rpmExpand(%{___NVRA}, NULL);
+ s = headerSprintf(fi-h, fmt,
+ rpmTagTable, rpmHeaderFormats, NULL);
+ syslog(LOG_NOTICE, [RPM] %s removed\n, s);
+ fmt = _free(fmt);
+ s = _free(s);
+ }
+#endif
if (rc != RPMRC_OK) {
xx = rpmtxnAbort(rpmtsGetRdb(ts)-db_txn);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES Doxyfile.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 16-May-2011 02:34:36 Branch: rpm-5_4 Handle: 2011051600343500 Modified files: (Branch: rpm-5_4) rpm CHANGES Doxyfile.in Log: update doxygen input filename paths. Summary: RevisionChanges Path 1.3501.2.126+1 -0 rpm/CHANGES 2.100.2.1 +4 -6 rpm/Doxyfile.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.125 -r1.3501.2.126 CHANGES --- rpm/CHANGES 14 May 2011 20:37:35 - 1.3501.2.125 +++ rpm/CHANGES 16 May 2011 00:34:35 - 1.3501.2.126 @@ -1,4 +1,5 @@ 5.4.0 - 5.4.1: +- proyvind: update doxygen input filename paths. - proyvind: fix assertion error when trying to install packages without required permissions. - devzero2000: document --whatneeds and --needswhat @@ . patch -p0 '@@ .' Index: rpm/Doxyfile.in $ cvs diff -u -r2.100 -r2.100.2.1 Doxyfile.in --- rpm/Doxyfile.in 27 Sep 2010 23:33:06 - 2.100 +++ rpm/Doxyfile.in 16 May 2011 00:34:35 - 2.100.2.1 @@ -540,8 +540,6 @@ @top_srcdir@/lib/rpmps.h \ @top_srcdir@/lib/rpmrc.c \ @top_srcdir@/lib/rpmrollback.c \ - @top_srcdir@/lib/rpmsx.c \ - @top_srcdir@/lib/rpmsx.h \ @top_srcdir@/lib/rpmte.c \ @top_srcdir@/lib/rpmte.h \ @top_srcdir@/lib/rpmts.c \ @@ -604,7 +602,7 @@ @top_srcdir@/rpmio/iosm.c \ @top_srcdir@/rpmio/iosm.h \ @top_srcdir@/rpmio/lookup3.c \ - @top_srcdir@/rpmio/lzdio.c \ + @top_srcdir@/rpmio/xzdio.c \ @top_srcdir@/rpmio/macro.c \ @top_srcdir@/rpmio/mire.c \ @top_srcdir@/rpmio/mire.h \ @@ -617,13 +615,10 @@ @top_srcdir@/rpmio/rpmdav.h \ @top_srcdir@/rpmio/rpmgc.c \ @top_srcdir@/rpmio/rpmgc.h \ - @top_srcdir@/rpmio/rpmgrep.c \ @top_srcdir@/rpmio/rpmhash.c \ @top_srcdir@/rpmio/rpmhash.h \ @top_srcdir@/rpmio/rpmhook.c \ @top_srcdir@/rpmio/rpmhook.h \ - @top_srcdir@/rpmio/rpmImpl.c \ - @top_srcdir@/rpmio/rpmImpl.h \ @top_srcdir@/rpmio/rpmio.c \ @top_srcdir@/rpmio/rpmio.h \ @top_srcdir@/rpmio/rpmio_internal.h \ @@ -660,6 +655,8 @@ @top_srcdir@/rpmio/rpmsquirrel.h \ @top_srcdir@/rpmio/rpmssl.c \ @top_srcdir@/rpmio/rpmssl.h \ + @top_srcdir@/rpmio/rpmsx.c \ + @top_srcdir@/rpmio/rpmsx.h \ @top_srcdir@/rpmio/rpmsw.c \ @top_srcdir@/rpmio/rpmsw.h \ @top_srcdir@/rpmio/rpmtcl.c \ @@ -706,6 +703,7 @@ @top_srcdir@/tools/rpmcmp.c \ @top_srcdir@/tools/rpmdeps.c \ @top_srcdir@/tools/rpmdigest.c \ + @top_srcdir@/tools/rpmgrep.c \ @top_srcdir@/tools/rpmmtree.c \ @top_srcdir@/tools/rpmrepo.c \ @top_srcdir@/ruby @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES Doxyfile.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 16-May-2011 02:37:13 Branch: rpm-5_3 Handle: 2011051600371200 Modified files: (Branch: rpm-5_3) rpm CHANGES Doxyfile.in Log: update doxygen input filename paths. Summary: RevisionChanges Path 1.3296.2.232+1 -0 rpm/CHANGES 2.96.4.2+4 -6 rpm/Doxyfile.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.231 -r1.3296.2.232 CHANGES --- rpm/CHANGES 14 May 2011 20:39:11 - 1.3296.2.231 +++ rpm/CHANGES 16 May 2011 00:37:12 - 1.3296.2.232 @@ -1,4 +1,5 @@ 5.3.11 - 5.3.12 +- proyvind: update doxygen input filename paths. - proyvind: fix assertion error when trying to install packages without required permissions. - devzero2000: add openmamba macro to the rpm spec file @@ . patch -p0 '@@ .' Index: rpm/Doxyfile.in $ cvs diff -u -r2.96.4.1 -r2.96.4.2 Doxyfile.in --- rpm/Doxyfile.in 27 Sep 2010 23:34:48 - 2.96.4.1 +++ rpm/Doxyfile.in 16 May 2011 00:37:12 - 2.96.4.2 @@ -538,8 +538,6 @@ @top_srcdir@/lib/rpmps.h \ @top_srcdir@/lib/rpmrc.c \ @top_srcdir@/lib/rpmrollback.c \ - @top_srcdir@/lib/rpmsx.c \ - @top_srcdir@/lib/rpmsx.h \ @top_srcdir@/lib/rpmte.c \ @top_srcdir@/lib/rpmte.h \ @top_srcdir@/lib/rpmts.c \ @@ -602,7 +600,7 @@ @top_srcdir@/rpmio/iosm.c \ @top_srcdir@/rpmio/iosm.h \ @top_srcdir@/rpmio/lookup3.c \ - @top_srcdir@/rpmio/lzdio.c \ + @top_srcdir@/rpmio/xzdio.c \ @top_srcdir@/rpmio/macro.c \ @top_srcdir@/rpmio/mire.c \ @top_srcdir@/rpmio/mire.h \ @@ -615,13 +613,10 @@ @top_srcdir@/rpmio/rpmdav.h \ @top_srcdir@/rpmio/rpmgc.c \ @top_srcdir@/rpmio/rpmgc.h \ - @top_srcdir@/rpmio/rpmgrep.c \ @top_srcdir@/rpmio/rpmhash.c \ @top_srcdir@/rpmio/rpmhash.h \ @top_srcdir@/rpmio/rpmhook.c \ @top_srcdir@/rpmio/rpmhook.h \ - @top_srcdir@/rpmio/rpmImpl.c \ - @top_srcdir@/rpmio/rpmImpl.h \ @top_srcdir@/rpmio/rpmio.c \ @top_srcdir@/rpmio/rpmio.h \ @top_srcdir@/rpmio/rpmio_internal.h \ @@ -658,6 +653,8 @@ @top_srcdir@/rpmio/rpmsquirrel.h \ @top_srcdir@/rpmio/rpmssl.c \ @top_srcdir@/rpmio/rpmssl.h \ + @top_srcdir@/rpmio/rpmsx.c \ + @top_srcdir@/rpmio/rpmsx.h \ @top_srcdir@/rpmio/rpmsw.c \ @top_srcdir@/rpmio/rpmsw.h \ @top_srcdir@/rpmio/rpmtcl.c \ @@ -704,6 +701,7 @@ @top_srcdir@/tools/rpmcmp.c \ @top_srcdir@/tools/rpmdeps.c \ @top_srcdir@/tools/rpmdigest.c \ + @top_srcdir@/tools/rpmgrep.c \ @top_srcdir@/tools/rpmmtree.c \ @top_srcdir@/tools/rpmrepo.c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/rpmio/ iosm.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 14-May-2011 22:36:14 Branch: HEAD Handle: 2011051420361400 Modified files: rpm CHANGES rpm/rpmio iosm.c Log: fix assertion error when trying to install packages without required permissions. Summary: RevisionChanges Path 1.3640 +2 -0 rpm/CHANGES 1.44+2 -1 rpm/rpmio/iosm.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3639 -r1.3640 CHANGES --- rpm/CHANGES 12 May 2011 10:01:48 - 1.3639 +++ rpm/CHANGES 14 May 2011 20:36:14 - 1.3640 @@ -1,4 +1,6 @@ 5.4.0 - 5.4.1: +- proyvind: fix assertion error when trying to install packages without + required permissions. - devzero2000: begin to put the preliminary check for SUSE - afb: yaml: fix changelog entry markup - afb: hdrfmt.c: add ISO-8601 date format @@ . patch -p0 '@@ .' Index: rpm/rpmio/iosm.c $ cvs diff -u -r1.43 -r1.44 iosm.c --- rpm/rpmio/iosm.c 29 Sep 2010 14:54:30 - 1.43 +++ rpm/rpmio/iosm.c 14 May 2011 20:36:14 - 1.44 @@ -2630,7 +2630,8 @@ rc = IOSMERR_OPEN_FAILED; } #if defined(POSIX_FADV_DONTNEED) - (void) Fadvise(iosm-wfd, 0, 0, POSIX_FADV_DONTNEED); + else + (void) Fadvise(iosm-wfd, 0, 0, POSIX_FADV_DONTNEED); #endif if (iosm-debug (stage IOSM_SYSCALL)) rpmlog(RPMLOG_DEBUG, %8s (%s, \w\) wfd %p wrbuf %p\n, cur, @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/rpmio/ iosm.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 14-May-2011 22:39:12 Branch: rpm-5_3 Handle: 2011051420391101 Modified files: (Branch: rpm-5_3) rpm CHANGES rpm/rpmio iosm.c Log: fix assertion error when trying to install packages without required permissions. Summary: RevisionChanges Path 1.3296.2.231+2 -0 rpm/CHANGES 1.42.2.3+2 -1 rpm/rpmio/iosm.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.230 -r1.3296.2.231 CHANGES --- rpm/CHANGES 11 May 2011 12:53:32 - 1.3296.2.230 +++ rpm/CHANGES 14 May 2011 20:39:11 - 1.3296.2.231 @@ -1,4 +1,6 @@ 5.3.11 - 5.3.12 +- proyvind: fix assertion error when trying to install packages without + required permissions. - devzero2000: add openmamba macro to the rpm spec file - devzero2000: add openmamba macro to configure.ac so it is distributable. Also use AC_SUBSTS RPMCANONVENDOR configure variable in openmanba.in @@ . patch -p0 '@@ .' Index: rpm/rpmio/iosm.c $ cvs diff -u -r1.42.2.2 -r1.42.2.3 iosm.c --- rpm/rpmio/iosm.c 29 Sep 2010 15:33:11 - 1.42.2.2 +++ rpm/rpmio/iosm.c 14 May 2011 20:39:12 - 1.42.2.3 @@ -2630,7 +2630,8 @@ rc = IOSMERR_OPEN_FAILED; } #if defined(POSIX_FADV_DONTNEED) - (void) Fadvise(iosm-wfd, 0, 0, POSIX_FADV_DONTNEED); + else + (void) Fadvise(iosm-wfd, 0, 0, POSIX_FADV_DONTNEED); #endif if (iosm-debug (stage IOSM_SYSCALL)) rpmlog(RPMLOG_DEBUG, %8s (%s, \w\) wfd %p wrbuf %p\n, cur, @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/macros/ mandriva.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 04-May-2011 14:19:38 Branch: HEAD Handle: 2011050412193800 Modified files: rpm/macros mandriva.in Log: add %disturl Summary: RevisionChanges Path 1.16+1 -0 rpm/macros/mandriva.in patch -p0 '@@ .' Index: rpm/macros/mandriva.in $ cvs diff -u -r1.15 -r1.16 mandriva.in --- rpm/macros/mandriva.in28 Apr 2011 15:58:12 - 1.15 +++ rpm/macros/mandriva.in4 May 2011 12:19:38 - 1.16 @@ -1,6 +1,7 @@ %distributionMandriva Linux %vendor Mandriva %bugurl http://qa.mandriva.com +%disturl http://mandriva.org # This macro will disable the transaction lock on /var/lib/rpm/__db.*. # This lock is of no use to us and will also result in errors when trying to @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/macros/ mandriva.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 04-May-2011 14:19:55 Branch: rpm-5_4 Handle: 2011050412195400 Modified files: (Branch: rpm-5_4) rpm/macros mandriva.in Log: add %disturl Summary: RevisionChanges Path 1.7.2.9 +1 -0 rpm/macros/mandriva.in patch -p0 '@@ .' Index: rpm/macros/mandriva.in $ cvs diff -u -r1.7.2.8 -r1.7.2.9 mandriva.in --- rpm/macros/mandriva.in28 Apr 2011 15:59:35 - 1.7.2.8 +++ rpm/macros/mandriva.in4 May 2011 12:19:54 - 1.7.2.9 @@ -1,6 +1,7 @@ %distributionMandriva Linux %vendor Mandriva %bugurl http://qa.mandriva.com +%disturl http://mandriva.org # This macro will disable the transaction lock on /var/lib/rpm/__db.*. # This lock is of no use to us and will also result in errors when trying to @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ rpmts.h rpm/rpmdb/ rpmns.h rpmtypes.h rpm...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 03-May-2011 17:59:00
Branch: rpm-5_3 Handle: 2011050315585901
Modified files: (Branch: rpm-5_3)
rpm/lib rpmts.h
rpm/rpmdb rpmns.h rpmtypes.h
rpm/rpmio rpmiotypes.h
Log:
fix compile warning with -pedantic about comma at end of enumerator
list
Summary:
RevisionChanges Path
2.130.2.4 +2 -2 rpm/lib/rpmts.h
1.4.4.1 +1 -1 rpm/rpmdb/rpmns.h
1.5.2.2 +1 -1 rpm/rpmdb/rpmtypes.h
1.46.2.1+2 -2 rpm/rpmio/rpmiotypes.h
patch -p0 '@@ .'
Index: rpm/lib/rpmts.h
$ cvs diff -u -r2.130.2.3 -r2.130.2.4 rpmts.h
--- rpm/lib/rpmts.h 1 Oct 2010 20:22:50 - 2.130.2.3
+++ rpm/lib/rpmts.h 3 May 2011 15:58:59 - 2.130.2.4
@@ -91,7 +91,7 @@
RPMTRANS_FLAG_NOFDIGESTS = (1 27),/*! from --nofdigests */
RPMTRANS_FLAG_NOPRETRANS = (1 28),/*! from --nopretrans */
RPMTRANS_FLAG_NOPOSTTRANS= (1 29),/*! from --noposttrans
*/
-RPMTRANS_FLAG_NOCONFIGS = (1 30),/*! from --noconfigs */
+RPMTRANS_FLAG_NOCONFIGS = (1 30) /*! from --noconfigs */
/* 31 unused */
} rpmtransFlags;
@@ -153,7 +153,7 @@
typedef enum tsStage_e {
TSM_UNKNOWN = 0,
TSM_INSTALL = 7,
-TSM_ERASE= 8,
+TSM_ERASE= 8
} tsmStage;
#if defined(_RPMTS_INTERNAL)
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/rpmns.h
$ cvs diff -u -r1.4 -r1.4.4.1 rpmns.h
--- rpm/rpmdb/rpmns.h 17 Jan 2009 23:02:43 - 1.4
+++ rpm/rpmdb/rpmns.h 3 May 2011 15:58:59 - 1.4.4.1
@@ -52,7 +52,7 @@
RPMNS_TYPE_VCHECK= (1 26), /*! vcheck(foo) */
RPMNS_TYPE_SIGNATURE= (1 27),/*! signature(/text:/sig) =
/pub:id */
RPMNS_TYPE_VERIFY= (1 28), /*! verify(N) = E:V-R */
-RPMNS_TYPE_CONFIG= (1 29), /*! config(N) = E:V-R */
+RPMNS_TYPE_CONFIG= (1 29)/*! config(N) = E:V-R */
} nsType;
#if defined(_RPMNS_INTERNAL)
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/rpmtypes.h
$ cvs diff -u -r1.5.2.1 -r1.5.2.2 rpmtypes.h
--- rpm/rpmdb/rpmtypes.h 16 Oct 2010 01:48:33 - 1.5.2.1
+++ rpm/rpmdb/rpmtypes.h 3 May 2011 15:58:59 - 1.5.2.2
@@ -92,7 +92,7 @@
RPMSCRIPT_STATE_REAPED = (1 17), /*! scriptlet was reaped */
/* 18-23 unused */
RPMSCRIPT_STATE_SELINUX = (1 24), /*! scriptlet exec by SELinux */
-RPMSCRIPT_STATE_EMBEDDED = (1 25), /*! scriptlet exec by lua et al */
+RPMSCRIPT_STATE_EMBEDDED = (1 25) /*! scriptlet exec by lua et al */
/* 26-31 unused */
} rpmScriptState;
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmiotypes.h
$ cvs diff -u -r1.46 -r1.46.2.1 rpmiotypes.h
--- rpm/rpmio/rpmiotypes.h24 Dec 2009 16:23:50 - 1.46
+++ rpm/rpmio/rpmiotypes.h3 May 2011 15:59:00 - 1.46.2.1
@@ -308,7 +308,7 @@
PGPHASHALGO_HAMSI_224= 248+0,/*! (private) HAMSI-224 */
PGPHASHALGO_HAMSI_256= 248+1,/*! (private) HAMSI-256 */
PGPHASHALGO_HAMSI_384= 248+2,/*! (private) HAMSI-384 */
-PGPHASHALGO_HAMSI_512= 248+3,/*! (private) HAMSI-512 */
+PGPHASHALGO_HAMSI_512= 248+3/*! (private) HAMSI-512 */
} pgpHashAlgo;
@@ -316,7 +316,7 @@
* Bit(s) to control digest operation.
*/
typedef enum rpmDigestFlags_e {
-RPMDIGEST_NONE = 0,
+RPMDIGEST_NONE = 0
} rpmDigestFlags;
#if defined(_RPMIOB_INTERNAL)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ rpmds.c rpmfc.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 28-Apr-2011 17:49:04
Branch: rpm-5_3 Handle: 2011042815490400
Modified files: (Branch: rpm-5_3)
rpm/lib rpmds.c rpmfc.c
Log:
queued changes for fixing uClibc() dependencies and also devel()
dependencies, sorry for big commit..
Summary:
RevisionChanges Path
2.167.2.15 +78 -11 rpm/lib/rpmds.c
1.73.2.10 +36 -1 rpm/lib/rpmfc.c
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.167.2.14 -r2.167.2.15 rpmds.c
--- rpm/lib/rpmds.c 16 Apr 2011 14:39:46 - 2.167.2.14
+++ rpm/lib/rpmds.c 28 Apr 2011 15:49:04 - 2.167.2.15
@@ -2906,7 +2906,7 @@
if (isElf64) {
/* XXX: eehhk, would've been nice with consistency, mandriva legacy...
:| */
if (!devel s[strlen(s)-1] != ')')
- (void) stpcpy( stpcpy(tmp, s), ()(64bit));
+ tmp = stpcpy( stpcpy(tmp, s), ()(64bit));
else {
tmp = stpcpy(tmp, s);
if (devel)
@@ -2985,8 +2985,11 @@
scn = gelf_offscn (elf, phdr-p_offset);
shdr = gelf_getshdr(scn, shdr_mem);
data = elf_getdata (scn, data);
- interp_name = strdup(data-d_buf);
- goto end;
+ if (data data-d_buf) {
+ interp_name = strdup(data-d_buf);
+ goto end;
+ }
+ /* no 'data' most likely implies that this is an elf interpreter itself
*/
}
if (elf_getshdrstrndx (elf, shstrndx) = 0)
@@ -3006,6 +3009,15 @@
for (cnt = 0; cnt = dynsize; ++cnt) {
dyn = gelf_getdyn (data, cnt, dyn_mem);
+ /* if this an elf interpeter, the only thing we want is
to find SONAME
+ * and return it
+ */
+ if (phdr) {
+ if (dyn-d_tag != DT_SONAME)
+ continue;
+ interp_name = strdup(elf_strptr(elf, shdr-sh_link,
dyn-d_un.d_val));
+ goto end;
+ }
if (rpath == NULL) {
if (dyn-d_tag == DT_RPATH)
rpath = elf_strptr (elf, shdr-sh_link,
dyn-d_un.d_val);
@@ -3015,7 +3027,7 @@
cnt = -1;
continue;
}
- else if (rpath DT_NEEDED == dyn-d_tag) {
+ else if (rpath dyn-d_tag == DT_NEEDED) {
char *tmp, *tmp2;
char buf[1024];
char path[1024] = ;
@@ -3073,6 +3085,7 @@
strcpy(tmp, path_n);
strcat(tmp, /);
strcat(tmp, libpath);
+
if (stat(tmp, statbuf) == 0
statbuf.st_mode S_IRUSR) {
path[0] = '\0';
break;
@@ -3504,6 +3517,7 @@
char buf[BUFSIZ];
const char * s;
int is_executable;
+int is_symlink;
const char * soname = NULL;
rpmds ds;
int xx;
@@ -3529,12 +3543,6 @@
if ((s = strrchr(fn, '.')) strcmp(s, .so))
return 0;
-if ((lnklen = readlink(fn, path, MAXPATHLEN - 1)) == -1) {
- warn(%s, fn);
- return -1;
-}
-path[lnklen] = '\0';
-
/*@-castfcnptr@*/
if (_rpmds_debug 0)
fprintf(stderr, *** rpmdsELF(%s, %d, %p, %p)\n, fn, flags, (void *)add,
context);
@@ -3545,6 +3553,62 @@
if (lstat(fn, st) != 0)
return -1;
is_executable = (int)(st-st_mode (S_IXUSR|S_IXGRP|S_IXOTH));
+ is_symlink = S_ISLNK(st-st_mode);
+}
+
+if (is_symlink) {
+#ifdef NOT_YET
+ if ((lnklen = readlink(fn, path, MAXPATHLEN - 1)) == -1) {
+ warn(%s, fn);
+ return -1;
+ }
+ /* XXX: unused, path should expand to absolute path... */
+ path[lnklen] = '\0';
+#endif
+} else {
+ FILE *fp = fopen(fn, r);
+ char buf[BUFSIZ];
+ char *in;
+ stpcpy(path, fn);
+ fn = NULL;
+ if (fp == NULL || ferror(fp)) {
+ if (fp) (void) fclose(fp);
+ return -1;
+ }
+ /* try resolve ld scripts
+ * certainly *not* state of the art, but should in practice work
+ * everywhere where
[CVS] RPM: rpm-5_3: rpm/scripts/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 28-Apr-2011 17:51:48 Branch: rpm-5_3 Handle: 2011042815514800 Modified files: (Branch: rpm-5_3) rpm/scripts Makefile.am Log: add missing \ Summary: RevisionChanges Path 1.65.2.10 +1 -1 rpm/scripts/Makefile.am patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.65.2.9 -r1.65.2.10 Makefile.am --- rpm/scripts/Makefile.am 10 Apr 2011 13:54:19 - 1.65.2.9 +++ rpm/scripts/Makefile.am 28 Apr 2011 15:51:48 - 1.65.2.10 @@ -21,7 +21,7 @@ check-java-closure.sh java.prov.sh java.req.sh \ gstreamer.sh javadeps.sh libtooldeps.sh \ mono-find-provides mono-find-requires \ - check-multiarch-files multiarch-platform multiarch-dispatch + check-multiarch-files multiarch-platform multiarch-dispatch \ multiarch-dispatch.h mkmultiarch \ nix_meta \ osgideps.pl pkgconfigdeps.sh \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/scripts/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 28-Apr-2011 17:55:02 Branch: rpm-5_4 Handle: 2011042815550200 Modified files: (Branch: rpm-5_4) rpm/scripts Makefile.am Log: add missing \ Summary: RevisionChanges Path 1.75.2.7+1 -1 rpm/scripts/Makefile.am patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.75.2.6 -r1.75.2.7 Makefile.am --- rpm/scripts/Makefile.am 10 Apr 2011 13:53:30 - 1.75.2.6 +++ rpm/scripts/Makefile.am 28 Apr 2011 15:55:02 - 1.75.2.7 @@ -23,7 +23,7 @@ check-java-closure.sh java.prov.sh java.req.sh \ gstreamer.sh javadeps.sh libtooldeps.sh mgo \ mono-find-provides mono-find-requires \ - check-multiarch-files multiarch-platform multiarch-dispatch + check-multiarch-files multiarch-platform multiarch-dispatch \ multiarch-dispatch.h mkmultiarch \ nix_meta \ osgideps.pl pkgconfigdeps.sh \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 28-Apr-2011 18:00:54
Branch: rpm-5_3 Handle: 2011042816005400
Modified files: (Branch: rpm-5_3)
rpm/macros mandriva.in
Log:
fix multiarch path (from funda)
Summary:
RevisionChanges Path
1.1.2.17+3 -2 rpm/macros/mandriva.in
patch -p0 '@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.1.2.16 -r1.1.2.17 mandriva.in
--- rpm/macros/mandriva.in11 Apr 2011 00:35:30 - 1.1.2.16
+++ rpm/macros/mandriva.in28 Apr 2011 16:00:54 - 1.1.2.17
@@ -30,6 +30,7 @@
# This will die as soon as remaining usage has been phased out...
%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}
%manbo_mkrel() %mkrel
+%multiarch() %{1}
# This will enable the use of distepoch and disttag in stead of polluting
# %release with such.
@@ -101,8 +102,8 @@
%multiarch_platform multiarch-%{_arch}-%{_target_os}
%multiarch_bindir%{_bindir}/%{multiarch_platform}
%multiarch_includedir%{_includedir}/%{multiarch_platform}
-%multiarch_binaries()%{_rpmhome}/rpm/mkmultiarch binaries
%{1}
-%multiarch_includes()%{_rpmhome}/rpm/mkmultiarch includes
%{1}
+%multiarch_binaries()%{_rpmhome}/mkmultiarch binaries %{1}
+%multiarch_includes()%{_rpmhome}/mkmultiarch includes %{1}
# Check for need of multiarch, terminate build if needed and not used.
#
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmds.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 08:05:40
Branch: HEAD Handle: 2011041006053900
Modified files:
rpm/lib rpmds.c
Log:
filename must end with '.so' to be a devel(...) dependency
Summary:
RevisionChanges Path
2.176 +6 -0 rpm/lib/rpmds.c
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.175 -r2.176 rpmds.c
--- rpm/lib/rpmds.c 10 Apr 2011 05:54:36 - 2.175
+++ rpm/lib/rpmds.c 10 Apr 2011 06:05:39 - 2.176
@@ -3283,6 +3283,12 @@
int lnklen;
char path[MAXPATHLEN];
ARGV_t deps = NULL;
+size_t nb = strlen(fn);
+
+/* Filename must end with .so to be devel(...) dependency. */
+s = rindex(fn, '.');
+if (strcmp(s, .so))
+ return 0;
if ((lnklen = readlink(fn, path, MAXPATHLEN - 1)) == -1) {
warn(%s, fn);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ rpmds.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 08:06:17
Branch: rpm-5_3 Handle: 2011041006061700
Modified files: (Branch: rpm-5_3)
rpm/lib rpmds.c
Log:
filename must end with '.so' to be a devel(...) dependency
Summary:
RevisionChanges Path
2.167.2.9 +6 -0 rpm/lib/rpmds.c
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.167.2.8 -r2.167.2.9 rpmds.c
--- rpm/lib/rpmds.c 10 Apr 2011 05:54:55 - 2.167.2.8
+++ rpm/lib/rpmds.c 10 Apr 2011 06:06:17 - 2.167.2.9
@@ -3284,6 +3284,12 @@
int lnklen;
char path[MAXPATHLEN];
ARGV_t deps = NULL;
+size_t nb = strlen(fn);
+
+/* Filename must end with .so to be devel(...) dependency. */
+s = rindex(fn, '.');
+if (strcmp(s, .so))
+ return 0;
if ((lnklen = readlink(fn, path, MAXPATHLEN - 1)) == -1) {
warn(%s, fn);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmds.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 08:57:10
Branch: HEAD Handle: 2011041006570900
Modified files:
rpm/lib rpmds.c
Log:
filter out some redundant devel(...) dependencies
Summary:
RevisionChanges Path
2.177 +23 -10 rpm/lib/rpmds.c
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.176 -r2.177 rpmds.c
--- rpm/lib/rpmds.c 10 Apr 2011 06:05:39 - 2.176
+++ rpm/lib/rpmds.c 10 Apr 2011 06:57:09 - 2.177
@@ -2904,21 +2904,19 @@
if (!devel s[strlen(s)-1] != ')')
(void) stpcpy( stpcpy(tmp, s), ()(64bit));
else {
- char *suffix;
tmp = stpcpy(tmp, s);
- if (devel (suffix = strstr(t, .so)))
- tmp = suffix;
+ if (devel)
+ tmp = strstr(t, .so);
tmp = stpcpy(tmp, (64bit));
}
}else
#endif
tmp = stpcpy(tmp, s);
if (devel) {
- char *suffix;
- tmp = stpcpy(tmp, s);
- if (devel (suffix = strstr(t, .so)))
+ char *suffix = strstr(t, .so);
+ if (suffix)
tmp = suffix;
- (void) stpcpy(tmp, ));
+ tmp = stpcpy(tmp, ));
}
return t;
@@ -3282,8 +3280,16 @@
int skipR = (flags RPMELF_FLAG_SKIPREQUIRES);
int lnklen;
char path[MAXPATHLEN];
+/*
+ * We filter out these as they come with glibc, making dependencies on
+ * them rather redundant.
+ */
+const char *filterRequires[] = {ld-linux, ld64-linux
libBrokenLocale.so,
+ libanl.so, libc.so, libcidn.so, libcrypt.so, libdl.so,
libm.so,
+ libnsl.so, libnss_compat.so, libnss_dns.so, libnss_files.so,
+ libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so,
libpthread.so,
+ libresolv.so, librt.so, libutil.so, libthread_db.so};
ARGV_t deps = NULL;
-size_t nb = strlen(fn);
/* Filename must end with .so to be devel(...) dependency. */
s = rindex(fn, '.');
@@ -3357,7 +3363,13 @@
s = elf_strptr(elf, shdr-sh_link, dyn-d_un.d_val);
assert(s != NULL);
buf[0] = '\0';
- argvAdd(deps, s);
+
+ for (i = 0; i
(int)(sizeof(filterRequires)/sizeof(filterRequires[0])); i++)
+ if (!strncmp(s, filterRequires[i],
strlen(filterRequires[i])))
+ break;
+
+ if (sizeof(filterRequires)/sizeof(filterRequires[0]) ==
i)
+ argvAdd(deps, s);
/*@switchbreak@*/ break;
case DT_SONAME:
gotSONAME = 1;
@@ -3365,6 +3377,7 @@
assert(s != NULL);
/* Add next provide dependency. */
buf[0] = '\0';
+
if (!skipP) {
ds = rpmdsSingle(RPMTAG_PROVIDENAME,
sonameDep(buf, s, isElf64, 1),
@@ -3383,7 +3396,7 @@
/*@=uniondef @*/
exit:
-if (gotSONAME)
+if (gotSONAME !skipR)
for (i = 0, cnt = argvCount(deps); i cnt; i++) {
ds = rpmdsSingle(RPMTAG_REQUIRENAME,
sonameDep(buf, deps[i], isElf64, 1),
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/lib/ rpmds.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 08:57:24
Branch: rpm-5_4 Handle: 2011041006572300
Modified files: (Branch: rpm-5_4)
rpm/lib rpmds.c
Log:
filter out some redundant devel(...) dependencies
Summary:
RevisionChanges Path
2.170.2.7 +23 -10 rpm/lib/rpmds.c
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.170.2.6 -r2.170.2.7 rpmds.c
--- rpm/lib/rpmds.c 10 Apr 2011 06:05:58 - 2.170.2.6
+++ rpm/lib/rpmds.c 10 Apr 2011 06:57:23 - 2.170.2.7
@@ -2904,21 +2904,19 @@
if (!devel s[strlen(s)-1] != ')')
(void) stpcpy( stpcpy(tmp, s), ()(64bit));
else {
- char *suffix;
tmp = stpcpy(tmp, s);
- if (devel (suffix = strstr(t, .so)))
- tmp = suffix;
+ if (devel)
+ tmp = strstr(t, .so);
tmp = stpcpy(tmp, (64bit));
}
}else
#endif
tmp = stpcpy(tmp, s);
if (devel) {
- char *suffix;
- tmp = stpcpy(tmp, s);
- if (devel (suffix = strstr(t, .so)))
+ char *suffix = strstr(t, .so);
+ if (suffix)
tmp = suffix;
- (void) stpcpy(tmp, ));
+ tmp = stpcpy(tmp, ));
}
return t;
@@ -3282,8 +3280,16 @@
int skipR = (flags RPMELF_FLAG_SKIPREQUIRES);
int lnklen;
char path[MAXPATHLEN];
+/*
+ * We filter out these as they come with glibc, making dependencies on
+ * them rather redundant.
+ */
+const char *filterRequires[] = {ld-linux, ld64-linux
libBrokenLocale.so,
+ libanl.so, libc.so, libcidn.so, libcrypt.so, libdl.so,
libm.so,
+ libnsl.so, libnss_compat.so, libnss_dns.so, libnss_files.so,
+ libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so,
libpthread.so,
+ libresolv.so, librt.so, libutil.so, libthread_db.so};
ARGV_t deps = NULL;
-size_t nb = strlen(fn);
/* Filename must end with .so to be devel(...) dependency. */
s = rindex(fn, '.');
@@ -3357,7 +3363,13 @@
s = elf_strptr(elf, shdr-sh_link, dyn-d_un.d_val);
assert(s != NULL);
buf[0] = '\0';
- argvAdd(deps, s);
+
+ for (i = 0; i
(int)(sizeof(filterRequires)/sizeof(filterRequires[0])); i++)
+ if (!strncmp(s, filterRequires[i],
strlen(filterRequires[i])))
+ break;
+
+ if (sizeof(filterRequires)/sizeof(filterRequires[0]) ==
i)
+ argvAdd(deps, s);
/*@switchbreak@*/ break;
case DT_SONAME:
gotSONAME = 1;
@@ -3365,6 +3377,7 @@
assert(s != NULL);
/* Add next provide dependency. */
buf[0] = '\0';
+
if (!skipP) {
ds = rpmdsSingle(RPMTAG_PROVIDENAME,
sonameDep(buf, s, isElf64, 1),
@@ -3383,7 +3396,7 @@
/*@=uniondef @*/
exit:
-if (gotSONAME)
+if (gotSONAME !skipR)
for (i = 0, cnt = argvCount(deps); i cnt; i++) {
ds = rpmdsSingle(RPMTAG_REQUIRENAME,
sonameDep(buf, deps[i], isElf64, 1),
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ rpmds.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 08:57:34
Branch: rpm-5_3 Handle: 2011041006573400
Modified files: (Branch: rpm-5_3)
rpm/lib rpmds.c
Log:
filter out some redundant devel(...) dependencies
Summary:
RevisionChanges Path
2.167.2.10 +23 -10 rpm/lib/rpmds.c
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.167.2.9 -r2.167.2.10 rpmds.c
--- rpm/lib/rpmds.c 10 Apr 2011 06:06:17 - 2.167.2.9
+++ rpm/lib/rpmds.c 10 Apr 2011 06:57:34 - 2.167.2.10
@@ -2905,21 +2905,19 @@
if (!devel s[strlen(s)-1] != ')')
(void) stpcpy( stpcpy(tmp, s), ()(64bit));
else {
- char *suffix;
tmp = stpcpy(tmp, s);
- if (devel (suffix = strstr(t, .so)))
- tmp = suffix;
+ if (devel)
+ tmp = strstr(t, .so);
tmp = stpcpy(tmp, (64bit));
}
}else
#endif
tmp = stpcpy(tmp, s);
if (devel) {
- char *suffix;
- tmp = stpcpy(tmp, s);
- if (devel (suffix = strstr(t, .so)))
+ char *suffix = strstr(t, .so);
+ if (suffix)
tmp = suffix;
- (void) stpcpy(tmp, ));
+ tmp = stpcpy(tmp, ));
}
return t;
@@ -3283,8 +3281,16 @@
int skipR = (flags RPMELF_FLAG_SKIPREQUIRES);
int lnklen;
char path[MAXPATHLEN];
+/*
+ * We filter out these as they come with glibc, making dependencies on
+ * them rather redundant.
+ */
+const char *filterRequires[] = {ld-linux, ld64-linux
libBrokenLocale.so,
+ libanl.so, libc.so, libcidn.so, libcrypt.so, libdl.so,
libm.so,
+ libnsl.so, libnss_compat.so, libnss_dns.so, libnss_files.so,
+ libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so,
libpthread.so,
+ libresolv.so, librt.so, libutil.so, libthread_db.so};
ARGV_t deps = NULL;
-size_t nb = strlen(fn);
/* Filename must end with .so to be devel(...) dependency. */
s = rindex(fn, '.');
@@ -3358,7 +3364,13 @@
s = elf_strptr(elf, shdr-sh_link, dyn-d_un.d_val);
assert(s != NULL);
buf[0] = '\0';
- argvAdd(deps, s);
+
+ for (i = 0; i
(int)(sizeof(filterRequires)/sizeof(filterRequires[0])); i++)
+ if (!strncmp(s, filterRequires[i],
strlen(filterRequires[i])))
+ break;
+
+ if (sizeof(filterRequires)/sizeof(filterRequires[0]) ==
i)
+ argvAdd(deps, s);
/*@switchbreak@*/ break;
case DT_SONAME:
gotSONAME = 1;
@@ -3366,6 +3378,7 @@
assert(s != NULL);
/* Add next provide dependency. */
buf[0] = '\0';
+
if (!skipP) {
ds = rpmdsSingle(RPMTAG_PROVIDENAME,
sonameDep(buf, s, isElf64, 1),
@@ -3384,7 +3397,7 @@
/*@=uniondef @*/
exit:
-if (gotSONAME)
+if (gotSONAME !skipR)
for (i = 0, cnt = argvCount(deps); i cnt; i++) {
ds = rpmdsSingle(RPMTAG_REQUIRENAME,
sonameDep(buf, deps[i], isElf64, 1),
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 12:17:09
Branch: rpm-5_4 Handle: 2011041010170900
Modified files: (Branch: rpm-5_4)
rpm/tools dbconvert.c
Log:
drop __builtin_expect micro optimization which most likely the only
considerable effect of being breaking compatibility
Summary:
RevisionChanges Path
2.1.2.4 +2 -2 rpm/tools/dbconvert.c
patch -p0 '@@ .'
Index: rpm/tools/dbconvert.c
$ cvs diff -u -r2.1.2.3 -r2.1.2.4 dbconvert.c
--- rpm/tools/dbconvert.c 30 Mar 2011 14:17:31 - 2.1.2.3
+++ rpm/tools/dbconvert.c 10 Apr 2011 10:17:09 - 2.1.2.4
@@ -172,14 +172,14 @@
fflush(stdout);
if(i == 1 !*(uint32_t*)key.data)
continue;
- if(__builtin_expect(doswap, 1) 0) {
+ if(doswap 0) {
if((htole32(*(uint32_t*)key.data) 1000 swap 0) ||
(htole32(*(uint32_t*)key.data) 1000 swap 0))
doswap = 1;
else
doswap = 0;
}
- if(__builtin_expect(doswap, 1)) {
+ if(doswap) {
if(swap)
*(uint32_t*)key.data = bswap32(*(uint32_t*)key.data);
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 12:17:22
Branch: rpm-5_3 Handle: 2011041010172200
Modified files: (Branch: rpm-5_3)
rpm/tools dbconvert.c
Log:
drop __builtin_expect micro optimization which most likely the only
considerable effect of being breaking compatibility
Summary:
RevisionChanges Path
2.1.4.4 +2 -2 rpm/tools/dbconvert.c
patch -p0 '@@ .'
Index: rpm/tools/dbconvert.c
$ cvs diff -u -r2.1.4.3 -r2.1.4.4 dbconvert.c
--- rpm/tools/dbconvert.c 30 Mar 2011 14:18:19 - 2.1.4.3
+++ rpm/tools/dbconvert.c 10 Apr 2011 10:17:22 - 2.1.4.4
@@ -172,14 +172,14 @@
fflush(stdout);
if(i == 1 !*(uint32_t*)key.data)
continue;
- if(__builtin_expect(doswap, 1) 0) {
+ if(doswap 0) {
if((htole32(*(uint32_t*)key.data) 1000 swap 0) ||
(htole32(*(uint32_t*)key.data) 1000 swap 0))
doswap = 1;
else
doswap = 0;
}
- if(__builtin_expect(doswap, 1)) {
+ if(doswap) {
if(swap)
*(uint32_t*)key.data = bswap32(*(uint32_t*)key.data);
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES Makefile.am configure.ac rpm/macros/ kernel.in...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 12:50:14
Branch: HEAD Handle: 2011041010501301
Added files:
rpm/macros kernel.in
rpm/scripts kmod-deps.sh
Modified files:
rpm CHANGES Makefile.am configure.ac
rpm/scripts Makefile.am
Log:
rpmfc: add internel dep generator helper for kernel modules.
kmod-deps.sh: add dependency extractor from mandriva.
Summary:
RevisionChanges Path
1.3608 +2 -0 rpm/CHANGES
2.266 +3 -3 rpm/Makefile.am
2.485 +4 -3 rpm/configure.ac
1.1 +12 -0 rpm/macros/kernel.in
1.78+1 -1 rpm/scripts/Makefile.am
1.1 +61 -0 rpm/scripts/kmod-deps.sh
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3607 -r1.3608 CHANGES
--- rpm/CHANGES 10 Apr 2011 05:23:25 - 1.3607
+++ rpm/CHANGES 10 Apr 2011 10:50:13 - 1.3608
@@ -1,4 +1,6 @@
5.4.0 - 5.4.1:
+- proyvind: rpmfc: add internel dep generator helper for kernel modules.
+- provyind: kmod-deps.sh: add dependency extractor from mandriva.
- proyvind: rpmds: implement devel(libfoo) symlink dependencies from
Mandriva, but with proper ELF SONAME checking.
- jbj: mongo: stub-in a /usr/lib/rpm/bin mongo shell wrapper.
@@ .
patch -p0 '@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.265 -r2.266 Makefile.am
--- rpm/Makefile.am 1 Apr 2011 05:08:11 - 2.265
+++ rpm/Makefile.am 10 Apr 2011 10:50:13 - 2.266
@@ -112,9 +112,9 @@
pkgcfgdir = $(pkglibdir)/macros.d
pkgcfg_DATA = \
- macros/cmake macros/gstreamer macros/java macros/libtool
macros/mandriva \
- macros/mono macros/perl macros/pkgconfig macros/php macros/python
macros/ruby \
- macros/selinux macros/tcl
+ macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool \
+ macros/mandriva macros/mono macros/perl macros/pkgconfig macros/php \
+ macros/python macros/ruby macros/selinux macros/tcl
noinst_HEADERS = build.h debug.h system.h
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.484 -r2.485 configure.ac
--- rpm/configure.ac 3 Apr 2011 19:22:00 - 2.484
+++ rpm/configure.ac 10 Apr 2011 10:50:13 - 2.485
@@ -521,6 +521,7 @@
AC_PATH_PROG(__MAKE, make, %{_bindir}/make, $MYPATH)
AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
AC_PATH_PROG(__MONGO, mongo, %{_bindir}/mongo, $MYPATH)
+AC_PATH_PROG(__MODINFO, modinfo, /sbin/modinfo, $MYPATH)
AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
AC_PATH_PROG(__PATCH, patch, %{_bindir}/patch, $MYPATH)
AC_PATH_PROG(__PAX, pax, %{_bindir}/pax, $MYPATH)
@@ -2307,9 +2308,9 @@
scripts/Makefile
rpmdb/DB_CONFIG
macros/macros macros/macros.rpmbuild
-macros/cmake macros/gstreamer macros/java macros/libtool macros/mandriva
-macros/mono macros/perl macros/pkgconfig macros/php macros/python
macros/ruby
-macros/selinux macros/tcl
+macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool
+macros/mandriva macros/mono macros/perl macros/pkgconfig macros/php
+macros/python macros/ruby macros/selinux macros/tcl
doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
@@ .
patch -p0 '@@ .'
Index: rpm/macros/kernel.in
$ cvs diff -u -r0 -r1.1 kernel.in
--- /dev/null 2011-04-10 12:45:29.0 +0200
+++ kernel.in 2011-04-10 12:50:13.231404616 +0200
@@ -0,0 +1,12 @@
+# Kernel specific macro definitions.
+# To make use of these macros insert the following line into your spec file:
+# %{load:%{_usrlibrpm}/macros.d/kernel}
+
+%__modinfo @__MODINFO
+
+# Path to scripts to autogenerate gstreamer package dependencies,
+#
+# Note: Used if _use_internal_dependency_generator is non-zero. The
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+%__kernel_provides %{_rpmhome}/kmod-deps.sh --provides --modinfo %__modinfo
+#%__kernel_requires %{_rpmhome}/kmod-deps.sh --requires --modinfo %__modinfo
@@ .
patch -p0 '@@ .'
[CVS] RPM: rpm-5_3: rpm/ CHANGES Makefile.am configure.ac rpm/macros/ ...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 12:58:00
Branch: rpm-5_3 Handle: 2011041010575901
Added files: (Branch: rpm-5_3)
rpm/macros kernel.in
rpm/scripts kmod-deps.sh
Modified files: (Branch: rpm-5_3)
rpm CHANGES Makefile.am configure.ac
Log:
rpmfc: add internel dep generator helper for kernel modules.
kmod-deps.sh: add dependency extractor from mandriva.
Summary:
RevisionChanges Path
1.3296.2.205+2 -0 rpm/CHANGES
2.247.2.17 +3 -3 rpm/Makefile.am
2.432.2.54 +4 -3 rpm/configure.ac
1.1.4.2 +12 -0 rpm/macros/kernel.in
1.1.4.2 +61 -0 rpm/scripts/kmod-deps.sh
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.204 -r1.3296.2.205 CHANGES
--- rpm/CHANGES 10 Apr 2011 05:25:05 - 1.3296.2.204
+++ rpm/CHANGES 10 Apr 2011 10:57:59 - 1.3296.2.205
@@ -1,4 +1,6 @@
5.3.10 - 5.3.11
+- proyvind: rpmfc: add internel dep generator helper for kernel modules.
+- provyind: kmod-deps.sh: add dependency extractor from mandriva.
- proyvind: rpmds: implement devel(libfoo) symlink dependencies from
Mandriva, but with proper ELF SONAME checking.
- jbj: add a --nofsync popt alias (caveat: experimental risky).
@@ .
patch -p0 '@@ .'
Index: rpm/Makefile.am
$ cvs diff -u -r2.247.2.16 -r2.247.2.17 Makefile.am
--- rpm/Makefile.am 1 Apr 2011 05:22:44 - 2.247.2.16
+++ rpm/Makefile.am 10 Apr 2011 10:57:59 - 2.247.2.17
@@ -112,9 +112,9 @@
pkgcfgdir = $(pkglibdir)/macros.d
pkgcfg_DATA = \
- macros/cmake macros/gstreamer macros/java macros/libtool
macros/mandriva \
- macros/mono macros/perl macros/pkgconfig macros/php macros/python
macros/ruby \
- macros/selinux macros/tcl
+ macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool \
+ macros/mandriva macros/mono macros/perl macros/pkgconfig macros/php \
+ macros/python macros/ruby macros/selinux macros/tcl
noinst_HEADERS = build.h debug.h system.h
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.53 -r2.432.2.54 configure.ac
--- rpm/configure.ac 2 Apr 2011 03:20:14 - 2.432.2.53
+++ rpm/configure.ac 10 Apr 2011 10:57:59 - 2.432.2.54
@@ -520,6 +520,7 @@
AC_PATH_PROG(__MAKE, make, %{_bindir}/make, $MYPATH)
AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
AC_PATH_PROG(__MONGO, mongo, %{_bindir}/mongo, $MYPATH)
+AC_PATH_PROG(__MODINFO, modinfo, /sbin/modinfo, $MYPATH)
AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
AC_PATH_PROG(__PATCH, patch, %{_bindir}/patch, $MYPATH)
AC_PATH_PROG(__PAX, pax, %{_bindir}/pax, $MYPATH)
@@ -2291,9 +2292,9 @@
scripts/Makefile
rpmdb/DB_CONFIG
macros/macros macros/macros.rpmbuild
-macros/cmake macros/gstreamer macros/java macros/libtool macros/mandriva
-macros/mono macros/perl macros/pkgconfig macros/php macros/python
macros/ruby
-macros/selinux macros/tcl
+macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool
+macros/mandriva macros/mono macros/perl macros/pkgconfig macros/php
+macros/python macros/ruby macros/selinux macros/tcl
doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
@@ .
patch -p0 '@@ .'
Index: rpm/macros/kernel.in
$ cvs diff -u -r0 -r1.1.4.2 kernel.in
--- /dev/null 2011-04-10 12:55:00.0 +0200
+++ kernel.in 2011-04-10 12:57:59.362249011 +0200
@@ -0,0 +1,12 @@
+# Kernel specific macro definitions.
+# To make use of these macros insert the following line into your spec file:
+# %{load:%{_usrlibrpm}/macros.d/kernel}
+
+%__modinfo @__MODINFO
+
+# Path to scripts to autogenerate gstreamer package dependencies,
+#
+# Note: Used if _use_internal_dependency_generator is non-zero. The
+# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+%__kernel_provides %{_rpmhome}/kmod-deps.sh --provides --modinfo %__modinfo
+#%__kernel_requires %{_rpmhome}/kmod-deps.sh --requires
[CVS] RPM: rpm/scripts/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 10-Apr-2011 12:59:20 Branch: HEAD Handle: 2011041010592000 Modified files: rpm/scripts Makefile.am Log: forgot to add gstreamer.sh earlier... Summary: RevisionChanges Path 1.79+1 -1 rpm/scripts/Makefile.am patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.78 -r1.79 Makefile.am --- rpm/scripts/Makefile.am 10 Apr 2011 10:50:14 - 1.78 +++ rpm/scripts/Makefile.am 10 Apr 2011 10:59:20 - 1.79 @@ -21,7 +21,7 @@ find-provides.php find-requires.php \ freshen.sh gendiff getpo.sh http.req \ check-java-closure.sh java.prov.sh java.req.sh \ - javadeps.sh libtooldeps.sh \ + gstreamer.sh javadeps.sh libtooldeps.sh \ mono-find-provides mono-find-requires \ nix_meta \ osgideps.pl pkgconfigdeps.sh \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/macros/ python.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 13:19:24
Branch: HEAD Handle: 2011041011192400
Modified files:
rpm CHANGES
rpm/macros python.in
Log:
macros: sync with updated python macros from mandriva.
Summary:
RevisionChanges Path
1.3609 +1 -0 rpm/CHANGES
1.8 +28 -20 rpm/macros/python.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3608 -r1.3609 CHANGES
--- rpm/CHANGES 10 Apr 2011 10:50:13 - 1.3608
+++ rpm/CHANGES 10 Apr 2011 11:19:24 - 1.3609
@@ -1,4 +1,5 @@
5.4.0 - 5.4.1:
+- proyvind: macros: sync with updated python macros from mandriva.
- proyvind: rpmfc: add internel dep generator helper for kernel modules.
- provyind: kmod-deps.sh: add dependency extractor from mandriva.
- proyvind: rpmds: implement devel(libfoo) symlink dependencies from
@@ .
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.7 -r1.8 python.in
--- rpm/macros/python.in 1 Apr 2011 02:11:13 - 1.7
+++ rpm/macros/python.in 10 Apr 2011 11:19:24 - 1.8
@@ -6,35 +6,43 @@
# Path to scripts to autogenerate python package dependencies,
#
-# Note: Used iff _use_internal_dependency_generator is non-zero. The
+# Note: Used if _use_internal_dependency_generator is non-zero. The
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
%__python_provides %{_rpmhome}/pythoneggs.py --provides
%__python_requires %{_rpmhome}/pythoneggs.py --requires
#
+%python_sitearch %(%{__python} -c import os; from distutils.sysconfig
import get_python_lib; lib=get_python_lib(1); print os.path.islink(lib) and
os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib)
+%python_sitelib %(%{__python} -c import os; from distutils.sysconfig
import get_python_lib; lib=get_python_lib(); print os.path.islink(lib) and
os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib)
+%python_version %(%{__python} -c import sys; print(sys.version[0:3]))
+
# python main version
-%py_ver %(echo `python -c import sys; print sys.version[:3]`)
+%py_ver %(%{__python} -c import sys;
v=sys.version_info[:2]; print '%%d.%%d'%%v 2/dev/null || echo
PYTHON-NOT-FOUND)
+%py_prefix %(%{__python} -c import sys; print sys.prefix
2/dev/null || echo PYTHON-NOT-FOUND)
+%py_platlibdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=1)' 2/dev/null
|| echo PYTHON-LIBDIR-NOT-FOUND)
+%py_purelibdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=0)' 2/dev/null
|| echo PYTHON-LIBDIR-NOT-FOUND)
+# backward compatibility
+%py_libdir %py_purelibdir
+
+%py_platsitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(plat_specific=1)' 2/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
+%py_puresitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib()' 2/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
+%py_sitedir %py_puresitedir
-# directories
-%py_prefix %(echo `python -c import sys; print sys.prefix`)
-%py_libdir %{py_prefix}/lib/python%{py_ver}
-%py_incdir @oldincludedir@/python%{py_ver}
-%py_sitedir %{py_libdir}/site-packages
-%py_dyndir %{py_libdir}/lib-dynload
+%py_dyndir %{py_libdir}/lib-dynload
-# pure python modules compilation
-%py_comp %{__python} -c import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])
+%py_incdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_inc()' 2/dev/null || echo
PYTHON-INCLUDEDIR-NOT-FOUND)
-%py_ocomp%{__python} -O -c import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])
+%py_compile(O) \
+find %1 -name '*.pyc' -exec rm -f {} \\; \
+%{__python} -c import sys, os, compileall; br='%{buildroot}';
compileall.compile_dir(sys.argv[1], ddir=br and
(sys.argv[1][len(os.path.abspath(br)):]+'/') or None) %1 \
+%{-O: \
+find %1 -name '*.pyo'
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ python.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 13:20:11
Branch: rpm-5_4 Handle: 2011041011201001
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros python.in
Log:
macros: sync with updated python macros from mandriva.
Summary:
RevisionChanges Path
1.3501.2.108+1 -0 rpm/CHANGES
1.6.2.2 +28 -20 rpm/macros/python.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.107 -r1.3501.2.108 CHANGES
--- rpm/CHANGES 10 Apr 2011 10:54:19 - 1.3501.2.107
+++ rpm/CHANGES 10 Apr 2011 11:20:10 - 1.3501.2.108
@@ -1,4 +1,5 @@
5.4.0 - 5.4.1:
+- proyvind: macros: sync with updated python macros from mandriva.
- proyvind: rpmfc: add internel dep generator helper for kernel modules.
- provyind: kmod-deps.sh: add dependency extractor from mandriva.
- proyvind: rpmds: implement devel(libfoo) symlink dependencies from
@@ .
patch -p0 '@@ .'
Index: rpm/macros/python.in
$ cvs diff -u -r1.6.2.1 -r1.6.2.2 python.in
--- rpm/macros/python.in 1 Apr 2011 02:12:08 - 1.6.2.1
+++ rpm/macros/python.in 10 Apr 2011 11:20:11 - 1.6.2.2
@@ -6,35 +6,43 @@
# Path to scripts to autogenerate python package dependencies,
#
-# Note: Used iff _use_internal_dependency_generator is non-zero. The
+# Note: Used if _use_internal_dependency_generator is non-zero. The
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
%__python_provides %{_rpmhome}/pythoneggs.py --provides
%__python_requires %{_rpmhome}/pythoneggs.py --requires
#
+%python_sitearch %(%{__python} -c import os; from distutils.sysconfig
import get_python_lib; lib=get_python_lib(1); print os.path.islink(lib) and
os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib)
+%python_sitelib %(%{__python} -c import os; from distutils.sysconfig
import get_python_lib; lib=get_python_lib(); print os.path.islink(lib) and
os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib)
+%python_version %(%{__python} -c import sys; print(sys.version[0:3]))
+
# python main version
-%py_ver %(echo `python -c import sys; print sys.version[:3]`)
+%py_ver %(%{__python} -c import sys;
v=sys.version_info[:2]; print '%%d.%%d'%%v 2/dev/null || echo
PYTHON-NOT-FOUND)
+%py_prefix %(%{__python} -c import sys; print sys.prefix
2/dev/null || echo PYTHON-NOT-FOUND)
+%py_platlibdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=1)' 2/dev/null
|| echo PYTHON-LIBDIR-NOT-FOUND)
+%py_purelibdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=0)' 2/dev/null
|| echo PYTHON-LIBDIR-NOT-FOUND)
+# backward compatibility
+%py_libdir %py_purelibdir
+
+%py_platsitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib(plat_specific=1)' 2/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
+%py_puresitedir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_lib()' 2/dev/null || echo
PYTHON-LIBDIR-NOT-FOUND)
+%py_sitedir %py_puresitedir
-# directories
-%py_prefix %(echo `python -c import sys; print sys.prefix`)
-%py_libdir %{py_prefix}/lib/python%{py_ver}
-%py_incdir @oldincludedir@/python%{py_ver}
-%py_sitedir %{py_libdir}/site-packages
-%py_dyndir %{py_libdir}/lib-dynload
+%py_dyndir %{py_libdir}/lib-dynload
-# pure python modules compilation
-%py_comp %{__python} -c import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])
+%py_incdir %(%{__python} -c 'import distutils.sysconfig; print
distutils.sysconfig.get_python_inc()' 2/dev/null || echo
PYTHON-INCLUDEDIR-NOT-FOUND)
-%py_ocomp%{__python} -O -c import compileall; import sys;
compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])
+%py_compile(O) \
+find %1 -name '*.pyc' -exec rm -f {} \\; \
+%{__python} -c import sys, os, compileall; br='%{buildroot}';
compileall.compile_dir(sys.argv[1], ddir=br and
[CVS] RPM: rpm/ cpu-os-macros.tar.gz
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 10-Apr-2011 15:22:58 Branch: HEAD Handle: 2011041013225800 Modified files: rpm cpu-os-macros.tar.gz Log: add arch-specific %optflags for mandriva so that we can drop mandriva-specific macro files just for this Summary: RevisionChanges Path 1.4 BLOBrpm/cpu-os-macros.tar.gz (cd rpm \ uudecode '@@ .' \ mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig \ xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz \ rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta) Index: rpm/cpu-os-macros.tar.gz @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ cpu-os-macros.tar.gz
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 10-Apr-2011 15:23:12 Branch: rpm-5_4 Handle: 2011041013231200 Modified files: (Branch: rpm-5_4) rpm cpu-os-macros.tar.gz Log: add arch-specific %optflags for mandriva so that we can drop mandriva-specific macro files just for this Summary: RevisionChanges Path 1.2.6.2 BLOBrpm/cpu-os-macros.tar.gz (cd rpm \ uudecode '@@ .' \ mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig \ xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz \ rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta) Index: rpm/cpu-os-macros.tar.gz @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ cpu-os-macros.tar.gz
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 10-Apr-2011 15:23:38 Branch: rpm-5_3 Handle: 2011041013233800 Modified files: (Branch: rpm-5_3) rpm cpu-os-macros.tar.gz Log: add arch-specific %optflags for mandriva so that we can drop mandriva-specific macro files just for this Summary: RevisionChanges Path 1.2.4.2 BLOBrpm/cpu-os-macros.tar.gz (cd rpm \ uudecode '@@ .' \ mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig \ xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz \ rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta) Index: rpm/cpu-os-macros.tar.gz @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in rpm/sc...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 15:54:20
Branch: rpm-5_3 Handle: 2011041013541901
Added files: (Branch: rpm-5_3)
rpm/scripts check-multiarch-files mkmultiarch
multiarch-dispatch multiarch-dispatch.h
multiarch-platform
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/macros macros.rpmbuild.in
rpm/scripts Makefile.am
Log:
merge multiarch-utils from mandriva.
Summary:
RevisionChanges Path
1.3296.2.207+2 -1 rpm/CHANGES
1.4.2.1 +20 -2 rpm/macros/macros.rpmbuild.in
1.65.2.9+7 -1 rpm/scripts/Makefile.am
1.1.4.2 +92 -0 rpm/scripts/check-multiarch-files
1.1.4.2 +91 -0 rpm/scripts/mkmultiarch
1.1.4.2 +31 -0 rpm/scripts/multiarch-dispatch
1.1.4.2 +172 -0 rpm/scripts/multiarch-dispatch.h
1.1.4.2 +14 -0 rpm/scripts/multiarch-platform
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.206 -r1.3296.2.207 CHANGES
--- rpm/CHANGES 10 Apr 2011 11:20:51 - 1.3296.2.206
+++ rpm/CHANGES 10 Apr 2011 13:54:20 - 1.3296.2.207
@@ -1,5 +1,6 @@
5.3.10 - 5.3.11
- - proyvind: macros: sync with updated python macros from mandriva.
+- proyvind: merge multiarch-utils from mandriva.
+- proyvind: macros: sync with updated python macros from mandriva.
- proyvind: rpmfc: add internel dep generator helper for kernel modules.
- provyind: kmod-deps.sh: add dependency extractor from mandriva.
- proyvind: rpmds: implement devel(libfoo) symlink dependencies from
@@ .
patch -p0 '@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4 -r1.4.2.1 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 31 Mar 2010 12:22:06 - 1.4
+++ rpm/macros/macros.rpmbuild.in 10 Apr 2011 13:54:19 - 1.4.2.1
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4 2010/03/31 12:22:06 jbj Exp $
+# $Id: macros.rpmbuild.in,v 1.4.2.1 2011/04/10 13:54:19 pkarlsen Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -214,9 +214,27 @@
%_filter_GLIBC_PRIVATE 0
#
+# multiarch is used to deal with situations where headers that contain
+# ie. architecture specific parts to solve file conflicts between
+# packages of different archs in multilib environments.
+#
+# Note: more details at http://wiki.mandriva.com/en/Policies/Multiarch
+%multiarch_platform multiarch-%{_arch}-%{_target_os}
+%multiarch_bindir%{_bindir}/%{multiarch_platform}
+%multiarch_includedir%{_includedir}/%{multiarch_platform}
+%multiarch_binaries()%{_rpmhome}/rpm/mkmultiarch binaries
%{1}
+%multiarch_includes()%{_rpmhome}/rpm/mkmultiarch includes
%{1}
+
+# Check for need of multiarch, terminate build if needed and not used.
+#
+# Note: The default value should be 0 for legacy compatibility.
+# TODO: fix check script and implement support for using
+#%_multiarch_required_terminate_build1
+
+#
# Path to scripts to autogenerate package dependencies,
#
-# Note: Used iff _use_internal_dependency_generator is zero.
+# Note: Used if _use_internal_dependency_generator is zero.
#%__find_provides%{_rpmhome}/rpmdeps --provides
#%__find_requires%{_rpmhome}/rpmdeps --requires
%__find_provides %{_rpmhome}/find-provides
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/Makefile.am
$ cvs diff -u -r1.65.2.8 -r1.65.2.9 Makefile.am
--- rpm/scripts/Makefile.am 10 Apr 2011 11:00:07 - 1.65.2.8
+++ rpm/scripts/Makefile.am 10 Apr 2011 13:54:19 - 1.65.2.9
@@ -21,6 +21,8 @@
check-java-closure.sh java.prov.sh java.req.sh \
gstreamer.sh javadeps.sh libtooldeps.sh \
mono-find-provides mono-find-requires \
+ check-multiarch-files multiarch-platform multiarch-dispatch
+ multiarch-dispatch.h mkmultiarch \
nix_meta \
osgideps.pl pkgconfigdeps.sh \
perldeps.pl perl.prov perl.req pythondeps.sh pythoneggs.py \
@@ -42,7
[CVS] RPM: rpm/lib/ rpmds.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 11-Apr-2011 07:08:15
Branch: HEAD Handle: 2011041105081500
Modified files:
rpm/lib rpmds.c
Log:
fix segfault in case 's == NULL', also use strrchr() rather than
rindex()
Summary:
RevisionChanges Path
2.179 +2 -3 rpm/lib/rpmds.c
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.178 -r2.179 rpmds.c
--- rpm/lib/rpmds.c 10 Apr 2011 22:53:04 - 2.178
+++ rpm/lib/rpmds.c 11 Apr 2011 05:08:15 - 2.179
@@ -3282,7 +3282,7 @@
/** \ingroup rpmds
* Extract dependencies from a symlink.
- * XXX Prototype added to keep GCC quite and avoid adding a symbol.
+ * XXX Prototype added to keep GCC quiet and avoid adding a symbol.
* @param fn file name
* @param flags 1: skip provides 2: skip requires
* @param *add add(arg, ds) saves next provide/require symlink
dependency.
@@ -3330,8 +3330,7 @@
ARGV_t deps = NULL;
/* Filename must end with .so to be devel(...) dependency. */
-s = rindex(fn, '.');
-if (strcmp(s, .so))
+if ((s = strrchr(fn, '.')) strcmp(s, .so))
return 0;
if ((lnklen = readlink(fn, path, MAXPATHLEN - 1)) == -1) {
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/lib/ rpmds.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 11-Apr-2011 07:09:56
Branch: rpm-5_4 Handle: 2011041105095500
Modified files: (Branch: rpm-5_4)
rpm/lib rpmds.c
Log:
fix segfault in case 's == NULL', also use strrchr() rather than
rindex()
Summary:
RevisionChanges Path
2.170.2.9 +2 -3 rpm/lib/rpmds.c
patch -p0 '@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.170.2.8 -r2.170.2.9 rpmds.c
--- rpm/lib/rpmds.c 10 Apr 2011 22:55:23 - 2.170.2.8
+++ rpm/lib/rpmds.c 11 Apr 2011 05:09:55 - 2.170.2.9
@@ -3282,7 +3282,7 @@
/** \ingroup rpmds
* Extract dependencies from a symlink.
- * XXX Prototype added to keep GCC quite and avoid adding a symbol.
+ * XXX Prototype added to keep GCC quiet and avoid adding a symbol.
* @param fn file name
* @param flags 1: skip provides 2: skip requires
* @param *add add(arg, ds) saves next provide/require symlink
dependency.
@@ -3330,8 +3330,7 @@
ARGV_t deps = NULL;
/* Filename must end with .so to be devel(...) dependency. */
-s = rindex(fn, '.');
-if (strcmp(s, .so))
+if ((s = strrchr(fn, '.')) strcmp(s, .so))
return 0;
if ((lnklen = readlink(fn, path, MAXPATHLEN - 1)) == -1) {
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/lib/ psm.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 10-Apr-2011 01:02:05
Branch: rpm-5_3 Handle: 2011040923020400
Modified files: (Branch: rpm-5_3)
rpm/lib psm.c
Log:
fix file trigger hack for firing way too many times on mandriva
Summary:
RevisionChanges Path
2.394.2.10 +5 -15 rpm/lib/psm.c
patch -p0 '@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.394.2.9 -r2.394.2.10 psm.c
--- rpm/lib/psm.c 25 Mar 2011 15:13:34 - 2.394.2.9
+++ rpm/lib/psm.c 9 Apr 2011 23:02:04 - 2.394.2.10
@@ -1476,22 +1476,8 @@
/*@innercontinue@*/ continue;
rc |= handleOneTrigger(psm, fi-h, triggeredH, arg2);
prev = instance;
-
-#if !defined(RPM_VENDOR_MANDRIVA)
- /*
- * FIXME: 'instances' is never really used for anything later,
- * and seems to have some bug making it eat it all memory
- */
xx = argiAdd(instances, -1, instance);
xx = argiSort(instances, NULL);
-#else
- /* As no filenames or anything is passed to the trigger script,
- * there doesn't seem to be any reason to fire the same trigger
- * over and over..
- */
- if(tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES)
- break;
-#endif
}
mi = rpmmiFree(mi);
@@ -1634,8 +1620,12 @@
if (tagno != RPMTAG_NAME) {
/* XXX if trigger name ends with '/', use dirnames instead. */
if (N[0] == '/')
- tagno = (N[strlen(N)-1] == '/')
+#if defined(RPM_VENDOR_MANDRIVA)
+ continue;
+#else
+ tagno = (N[strlen(N)-1] == '/')
? RPMTAG_DIRNAMES : RPMTAG_FILEPATHS;
+#endif
}
/* XXX For now, permit globs only in unversioned triggers. */
if ((EVR == NULL || *EVR == '\0') Glob_pattern_p(N, 0))
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ cpu-os-macros.tar.gz
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 07-Apr-2011 22:29:52 Branch: HEAD Handle: 2011040720295200 Modified files: rpm cpu-os-macros.tar.gz Log: fix %_arch to be canonical for %ix86, x86_64 sparc Summary: RevisionChanges Path 1.3 BLOBrpm/cpu-os-macros.tar.gz (cd rpm \ uudecode '@@ .' \ mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig \ xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz \ rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta) Index: rpm/cpu-os-macros.tar.gz @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ cpu-os-macros.tar.gz
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 07-Apr-2011 22:30:22 Branch: rpm-5_4 Handle: 2011040720302200 Modified files: (Branch: rpm-5_4) rpm cpu-os-macros.tar.gz Log: fix %_arch to be canonical for %ix86, x86_64 sparc Summary: RevisionChanges Path 1.2.6.1 BLOBrpm/cpu-os-macros.tar.gz (cd rpm \ uudecode '@@ .' \ mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig \ xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz \ rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta) Index: rpm/cpu-os-macros.tar.gz @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ cpu-os-macros.tar.gz
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 07-Apr-2011 22:30:38 Branch: rpm-5_3 Handle: 2011040720303800 Modified files: (Branch: rpm-5_3) rpm cpu-os-macros.tar.gz Log: fix %_arch to be canonical for %ix86, x86_64 sparc Summary: RevisionChanges Path 1.2.4.1 BLOBrpm/cpu-os-macros.tar.gz (cd rpm \ uudecode '@@ .' \ mv cpu-os-macros.tar.gz cpu-os-macros.tar.gz.orig \ xdelta patch cpu-os-macros.tar.gz.xdelta cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz \ rm -f cpu-os-macros.tar.gz.orig cpu-os-macros.tar.gz.xdelta) Index: rpm/cpu-os-macros.tar.gz @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:29:41 Branch: HEAD Handle: 2011040519294000 Modified files: rpm CHANGES build.c Log: accept unicode characters. Summary: RevisionChanges Path 1.3601 +1 -0 rpm/CHANGES 2.125 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3600 -r1.3601 CHANGES --- rpm/CHANGES 3 Apr 2011 22:58:05 - 1.3600 +++ rpm/CHANGES 5 Apr 2011 19:29:40 - 1.3601 @@ -1,4 +1,5 @@ 5.4.0 - 5.4.1: +- proyvind: rpmbuild: accept unicode characters. - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++. - jbj: mongo: and re-export the mongo-c-driver through librpmio.vers. - jbj: mongo: pull in the gridfs methods from the mongo-c-driver too. @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124 -r2.125 build.c --- rpm/build.c 10 Feb 2010 20:24:49 - 2.124 +++ rpm/build.c 5 Apr 2011 19:29:40 - 2.125 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s))) return 0; + if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:30:32 Branch: rpm-5_4 Handle: 2011040519303101 Modified files: (Branch: rpm-5_4) rpm CHANGES build.c Log: accept unicode characters. Summary: RevisionChanges Path 1.3501.2.100+1 -0 rpm/CHANGES 2.124.4.1 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.99 -r1.3501.2.100 CHANGES --- rpm/CHANGES 3 Apr 2011 22:58:47 - 1.3501.2.99 +++ rpm/CHANGES 5 Apr 2011 19:30:31 - 1.3501.2.100 @@ -1,4 +1,5 @@ 5.4.0 - 5.4.1: +- proyvind: rpmbuild: accept unicode characters. - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++. - jbj: mongo: and re-export the mongo-c-driver through librpmio.vers. - jbj: mongo: pull in the gridfs methods from the mongo-c-driver too. @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124 -r2.124.4.1 build.c --- rpm/build.c 10 Feb 2010 20:24:49 - 2.124 +++ rpm/build.c 5 Apr 2011 19:30:32 - 2.124.4.1 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s))) return 0; + if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:31:37 Branch: rpm-5_3 Handle: 2011040519313601 Modified files: (Branch: rpm-5_3) rpm CHANGES build.c Log: accept unicode characters. Summary: RevisionChanges Path 1.3296.2.199+1 -0 rpm/CHANGES 2.124.2.1 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.198 -r1.3296.2.199 CHANGES --- rpm/CHANGES 2 Apr 2011 03:20:14 - 1.3296.2.198 +++ rpm/CHANGES 5 Apr 2011 19:31:36 - 1.3296.2.199 @@ -1,4 +1,5 @@ 5.3.10 - 5.3.11 +- proyvind: rpmbuild: accept unicode characters. - mdawkins: tagged 5.3.10 release in configure.ac 5.3.9 - 5.3.10 @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124 -r2.124.2.1 build.c --- rpm/build.c 10 Feb 2010 20:24:49 - 2.124 +++ rpm/build.c 5 Apr 2011 19:31:37 - 2.124.2.1 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s))) return 0; + if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:50:24 Branch: HEAD Handle: 2011040519502400 Modified files: rpm build.c Log: revert unicode change Summary: RevisionChanges Path 2.126 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.125 -r2.126 build.c --- rpm/build.c 5 Apr 2011 19:29:40 - 2.125 +++ rpm/build.c 5 Apr 2011 19:50:24 - 2.126 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:51:49 Branch: HEAD Handle: 2011040519514900 Modified files: rpm CHANGES build.c Log: revert unicode change Summary: RevisionChanges Path 1.3602 +0 -1 rpm/CHANGES 2.127 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3601 -r1.3602 CHANGES --- rpm/CHANGES 5 Apr 2011 19:29:40 - 1.3601 +++ rpm/CHANGES 5 Apr 2011 19:51:49 - 1.3602 @@ -1,5 +1,4 @@ 5.4.0 - 5.4.1: -- proyvind: rpmbuild: accept unicode characters. - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++. - jbj: mongo: and re-export the mongo-c-driver through librpmio.vers. - jbj: mongo: pull in the gridfs methods from the mongo-c-driver too. @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.126 -r2.127 build.c --- rpm/build.c 5 Apr 2011 19:50:24 - 2.126 +++ rpm/build.c 5 Apr 2011 19:51:49 - 2.127 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s))) return 0; + if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:54:44 Branch: rpm-5_3 Handle: 2011040519544301 Modified files: (Branch: rpm-5_3) rpm CHANGES build.c Log: revert unicode change Summary: RevisionChanges Path 1.3296.2.200+0 -1 rpm/CHANGES 2.124.2.2 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.199 -r1.3296.2.200 CHANGES --- rpm/CHANGES 5 Apr 2011 19:31:36 - 1.3296.2.199 +++ rpm/CHANGES 5 Apr 2011 19:54:43 - 1.3296.2.200 @@ -1,5 +1,4 @@ 5.3.10 - 5.3.11 -- proyvind: rpmbuild: accept unicode characters. - mdawkins: tagged 5.3.10 release in configure.ac 5.3.9 - 5.3.10 @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124.2.1 -r2.124.2.2 build.c --- rpm/build.c 5 Apr 2011 19:31:37 - 2.124.2.1 +++ rpm/build.c 5 Apr 2011 19:54:44 - 2.124.2.2 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:55:02 Branch: HEAD Handle: 2011040519550100 Modified files: rpm build.c Log: revert unicode change Summary: RevisionChanges Path 2.128 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.127 -r2.128 build.c --- rpm/build.c 5 Apr 2011 19:51:49 - 2.127 +++ rpm/build.c 5 Apr 2011 19:55:01 - 2.128 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:55:34 Branch: rpm-5_4 Handle: 2011040519553400 Modified files: (Branch: rpm-5_4) rpm CHANGES build.c Log: revert unicode change Summary: RevisionChanges Path 1.3501.2.101+0 -1 rpm/CHANGES 2.124.4.2 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.100 -r1.3501.2.101 CHANGES --- rpm/CHANGES 5 Apr 2011 19:30:31 - 1.3501.2.100 +++ rpm/CHANGES 5 Apr 2011 19:55:34 - 1.3501.2.101 @@ -1,5 +1,4 @@ 5.4.0 - 5.4.1: -- proyvind: rpmbuild: accept unicode characters. - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++. - jbj: mongo: and re-export the mongo-c-driver through librpmio.vers. - jbj: mongo: pull in the gridfs methods from the mongo-c-driver too. @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124.4.1 -r2.124.4.2 build.c --- rpm/build.c 5 Apr 2011 19:30:32 - 2.124.4.1 +++ rpm/build.c 5 Apr 2011 19:55:34 - 2.124.4.2 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/build/ parseDescription.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 05-Apr-2011 23:36:01
Branch: rpm-5_3 Handle: 201104052136
Modified files: (Branch: rpm-5_3)
rpm/build parseDescription.c
Log:
don't delete the inherited %description (mdvbz#62979)
uncertain about the correct behaviour here, I assume that what is supposed
to
happen is that missing %description for a sub-package should result in no
%description (thus an error), which doesn't seem to be the actual behaviour.
The type returned by headerGet() is not what is expected either..
Placing under a mandriva #ifdef for now...
Summary:
RevisionChanges Path
2.44.2.1+2 -0 rpm/build/parseDescription.c
patch -p0 '@@ .'
Index: rpm/build/parseDescription.c
$ cvs diff -u -r2.44 -r2.44.2.1 parseDescription.c
--- rpm/build/parseDescription.c 16 Feb 2010 15:12:21 - 2.44
+++ rpm/build/parseDescription.c 5 Apr 2011 21:36:00 - 2.44.2.1
@@ -90,6 +90,7 @@
}
/* Lose the inheirited %description (if present). */
+#if !defined(RPM_VENDOR_MANDRIVA) /* mdvbz#62979 */
{HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int xx;
he-tag = RPMTAG_DESCRIPTION;
@@ -98,6 +99,7 @@
if (xx he-t == RPM_STRING_TYPE)
xx = headerDel(pkg-header, he, 0);
}
+#endif
t = stashSt(spec, pkg-header, RPMTAG_DESCRIPTION, lang);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/scripts/ rubygems.rb
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 09:29:51
Branch: HEAD Handle: 2011040107295100
Modified files:
rpm CHANGES
rpm/scripts rubygems.rb
Log:
rubygems.rb: add/provide ruby(abi) dependencies for non-gems. (not my
proudest work.. ;)
Summary:
RevisionChanges Path
1.3592 +1 -0 rpm/CHANGES
1.8 +45 -12 rpm/scripts/rubygems.rb
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3591 -r1.3592 CHANGES
--- rpm/CHANGES 1 Apr 2011 05:08:11 - 1.3591
+++ rpm/CHANGES 1 Apr 2011 07:29:51 - 1.3592
@@ -1,4 +1,5 @@
5.4.0 - 5.4.1:
+- proyvind: rubygems.rb: add/provide ruby(abi) dependencies for non-gems.
- proyvind: rpmfc: add classifiers for gstreamer plugins dep generator.
- proyvind: use pythoneggs.py for python deps generated by internal
generator.
- proyvind: rpmfc: enable ruby file classifier internal dep generator.
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/rubygems.rb
$ cvs diff -u -r1.7 -r1.8 rubygems.rb
--- rpm/scripts/rubygems.rb 13 Mar 2011 20:08:58 - 1.7
+++ rpm/scripts/rubygems.rb 1 Apr 2011 07:29:51 - 1.8
@@ -3,40 +3,74 @@
# Copyright 2010 Per Ãyvind Karlsen peroyv...@mandriva.org
# This program is free software. It may be redistributed and/or modified
under
# the terms of the LGPL version 2.1 (or later).
+#
+# FIXME: Someone with actual ruby skills should really clean up and sanitize
+# this! fugliness obvious...
#++
require 'optparse'
-require 'rubygems'
+require 'rbconfig'
provides = false
requires = false
opts = OptionParser.new(#{$0} --provides|--requires)
opts.on(-P, --provides, Print provides) do |val|
-provides = true
+ provides = true
end
opts.on(-R, --requires, Print requires) do |val|
-requires= true
+ requires= true
end
rest = opts.permute(ARGV)
if rest.size != 0 or (!provides and !requires) or (provides and requires)
-$stderr.puts Use either --provides OR --requires
-$stderr.puts opts
-exit(1)
+ $stderr.puts Use either --provides OR --requires
+ $stderr.puts opts
+ exit(1)
end
-specpath = %s/specifications/.*\.gemspec$ % Gem::dir
+specpatt = Config::CONFIG[rubylibdir].sub(Config::CONFIG[ruby_version],
.*/specifications/.*\.gemspec$)
gems = []
-for gemspec in $stdin.readlines
- if gemspec.match(specpath)
-gems.push(gemspec.chomp)
+ruby_versioned = false
+abi_provide = false
+
+for path in $stdin.readlines
+ if path.match(specpatt)
+ruby_versioned = true
+gems.push(path.chomp)
+ # this is quite ugly and lame, but the assumption made is that if any files
+ # found in any of these directories specific to this ruby version, the
+ # package is dependent on this specific version.
+ # FIXME: only supports current ruby version
+ elsif not ruby_versioned
+if path.match(Config::CONFIG[rubylibdir])
+ ruby_versioned = true
+ # even more fugly, but we make the assumption that if the package has
+ # this file, the package is the current ruby version, and should
+ # therefore provide ruby(abi) = version
+ if provides and path.match(Config::CONFIG[rubylibdir] + /Env.rb)
+ abi_provide = true
+ end
+elsif path.match(Config::CONFIG[sitelibdir])
+ ruby_versioned = true
+elsif path.match(Config::CONFIG[vendorlibdir])
+ ruby_versioned = true
+end
+ end
+end
+
+if requires or abi_provide
+ print ruby(abi)
+ if ruby_versioned
+print = %s\n % Config::CONFIG[ruby_version]
end
end
+
if gems.length 0
+ require 'rubygems'
+
if requires
-require 'rbconfig'
module Gem
class Requirement
@@ -61,7 +95,6 @@
end
end
-print ruby(abi) = %s\n % Config::CONFIG[ruby_version]
end
for gem in gems
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/scripts/ rubygems.rb
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 09:30:29
Branch: rpm-5_4 Handle: 2011040107302800
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/scripts rubygems.rb
Log:
rubygems.rb: add/provide ruby(abi) dependencies for non-gems. (not my
proudest work.. ;)
Summary:
RevisionChanges Path
1.3501.2.90 +1 -0 rpm/CHANGES
1.5.2.3 +45 -12 rpm/scripts/rubygems.rb
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.89 -r1.3501.2.90 CHANGES
--- rpm/CHANGES 1 Apr 2011 05:16:20 - 1.3501.2.89
+++ rpm/CHANGES 1 Apr 2011 07:30:28 - 1.3501.2.90
@@ -1,4 +1,5 @@
5.4.0 - 5.4.1:
+- proyvind: rubygems.rb: add/provide ruby(abi) dependencies for non-gems.
- proyvind: rpmfc: add classifiers for gstreamer plugins dep generator.
- proyvind: use pythoneggs.py for python deps generated by internal
generator.
- proyvind: rpmfc: enable ruby file classifier internal dep generator.
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/rubygems.rb
$ cvs diff -u -r1.5.2.2 -r1.5.2.3 rubygems.rb
--- rpm/scripts/rubygems.rb 13 Mar 2011 20:11:31 - 1.5.2.2
+++ rpm/scripts/rubygems.rb 1 Apr 2011 07:30:28 - 1.5.2.3
@@ -3,40 +3,74 @@
# Copyright 2010 Per Ãyvind Karlsen peroyv...@mandriva.org
# This program is free software. It may be redistributed and/or modified
under
# the terms of the LGPL version 2.1 (or later).
+#
+# FIXME: Someone with actual ruby skills should really clean up and sanitize
+# this! fugliness obvious...
#++
require 'optparse'
-require 'rubygems'
+require 'rbconfig'
provides = false
requires = false
opts = OptionParser.new(#{$0} --provides|--requires)
opts.on(-P, --provides, Print provides) do |val|
-provides = true
+ provides = true
end
opts.on(-R, --requires, Print requires) do |val|
-requires= true
+ requires= true
end
rest = opts.permute(ARGV)
if rest.size != 0 or (!provides and !requires) or (provides and requires)
-$stderr.puts Use either --provides OR --requires
-$stderr.puts opts
-exit(1)
+ $stderr.puts Use either --provides OR --requires
+ $stderr.puts opts
+ exit(1)
end
-specpath = %s/specifications/.*\.gemspec$ % Gem::dir
+specpatt = Config::CONFIG[rubylibdir].sub(Config::CONFIG[ruby_version],
.*/specifications/.*\.gemspec$)
gems = []
-for gemspec in $stdin.readlines
- if gemspec.match(specpath)
-gems.push(gemspec.chomp)
+ruby_versioned = false
+abi_provide = false
+
+for path in $stdin.readlines
+ if path.match(specpatt)
+ruby_versioned = true
+gems.push(path.chomp)
+ # this is quite ugly and lame, but the assumption made is that if any files
+ # found in any of these directories specific to this ruby version, the
+ # package is dependent on this specific version.
+ # FIXME: only supports current ruby version
+ elsif not ruby_versioned
+if path.match(Config::CONFIG[rubylibdir])
+ ruby_versioned = true
+ # even more fugly, but we make the assumption that if the package has
+ # this file, the package is the current ruby version, and should
+ # therefore provide ruby(abi) = version
+ if provides and path.match(Config::CONFIG[rubylibdir] + /Env.rb)
+ abi_provide = true
+ end
+elsif path.match(Config::CONFIG[sitelibdir])
+ ruby_versioned = true
+elsif path.match(Config::CONFIG[vendorlibdir])
+ ruby_versioned = true
+end
+ end
+end
+
+if requires or abi_provide
+ print ruby(abi)
+ if ruby_versioned
+print = %s\n % Config::CONFIG[ruby_version]
end
end
+
if gems.length 0
+ require 'rubygems'
+
if requires
-require 'rbconfig'
module Gem
class Requirement
@@ -61,7 +95,6 @@
end
end
-print ruby(abi) = %s\n % Config::CONFIG[ruby_version]
end
for gem in gems
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/scripts/ rubygems.rb
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 09:31:18
Branch: rpm-5_3 Handle: 2011040107311701
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/scripts rubygems.rb
Log:
rubygems.rb: add/provide ruby(abi) dependencies for non-gems. (not my
proudest work.. ;)
Summary:
RevisionChanges Path
1.3296.2.193+1 -0 rpm/CHANGES
1.4.2.3 +45 -12 rpm/scripts/rubygems.rb
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.192 -r1.3296.2.193 CHANGES
--- rpm/CHANGES 1 Apr 2011 05:22:44 - 1.3296.2.192
+++ rpm/CHANGES 1 Apr 2011 07:31:18 - 1.3296.2.193
@@ -1,4 +1,5 @@
5.3.9 - 5.3.10
+- proyvind: rubygems.rb: add/provide ruby(abi) dependencies for non-gems.
- proyvind: rpmfc: add classifiers for gstreamer plugins dep generator.
- proyvind: use pythoneggs.py for python deps generated by internal
generator.
- proyvind: rpmfc: enable ruby file classifier internal dep generator.
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/rubygems.rb
$ cvs diff -u -r1.4.2.2 -r1.4.2.3 rubygems.rb
--- rpm/scripts/rubygems.rb 13 Mar 2011 20:17:26 - 1.4.2.2
+++ rpm/scripts/rubygems.rb 1 Apr 2011 07:31:17 - 1.4.2.3
@@ -3,40 +3,74 @@
# Copyright 2010 Per Ãyvind Karlsen peroyv...@mandriva.org
# This program is free software. It may be redistributed and/or modified
under
# the terms of the LGPL version 2.1 (or later).
+#
+# FIXME: Someone with actual ruby skills should really clean up and sanitize
+# this! fugliness obvious...
#++
require 'optparse'
-require 'rubygems'
+require 'rbconfig'
provides = false
requires = false
opts = OptionParser.new(#{$0} --provides|--requires)
opts.on(-P, --provides, Print provides) do |val|
-provides = true
+ provides = true
end
opts.on(-R, --requires, Print requires) do |val|
-requires= true
+ requires= true
end
rest = opts.permute(ARGV)
if rest.size != 0 or (!provides and !requires) or (provides and requires)
-$stderr.puts Use either --provides OR --requires
-$stderr.puts opts
-exit(1)
+ $stderr.puts Use either --provides OR --requires
+ $stderr.puts opts
+ exit(1)
end
-specpath = %s/specifications/.*\.gemspec$ % Gem::dir
+specpatt = Config::CONFIG[rubylibdir].sub(Config::CONFIG[ruby_version],
.*/specifications/.*\.gemspec$)
gems = []
-for gemspec in $stdin.readlines
- if gemspec.match(specpath)
-gems.push(gemspec.chomp)
+ruby_versioned = false
+abi_provide = false
+
+for path in $stdin.readlines
+ if path.match(specpatt)
+ruby_versioned = true
+gems.push(path.chomp)
+ # this is quite ugly and lame, but the assumption made is that if any files
+ # found in any of these directories specific to this ruby version, the
+ # package is dependent on this specific version.
+ # FIXME: only supports current ruby version
+ elsif not ruby_versioned
+if path.match(Config::CONFIG[rubylibdir])
+ ruby_versioned = true
+ # even more fugly, but we make the assumption that if the package has
+ # this file, the package is the current ruby version, and should
+ # therefore provide ruby(abi) = version
+ if provides and path.match(Config::CONFIG[rubylibdir] + /Env.rb)
+ abi_provide = true
+ end
+elsif path.match(Config::CONFIG[sitelibdir])
+ ruby_versioned = true
+elsif path.match(Config::CONFIG[vendorlibdir])
+ ruby_versioned = true
+end
+ end
+end
+
+if requires or abi_provide
+ print ruby(abi)
+ if ruby_versioned
+print = %s\n % Config::CONFIG[ruby_version]
end
end
+
if gems.length 0
+ require 'rubygems'
+
if requires
-require 'rbconfig'
module Gem
class Requirement
@@ -61,7 +95,6 @@
end
end
-print ruby(abi) = %s\n % Config::CONFIG[ruby_version]
end
for gem in gems
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/build/ reqprov.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 11:51:45
Branch: HEAD Handle: 2011040109514500
Modified files:
rpm CHANGES
rpm/build reqprov.c
Log:
filter overlapping depencies. leaving under mandriva #ifdef for now,
need to properly determine 'correctness' sanity..
Summary:
RevisionChanges Path
1.3593 +1 -0 rpm/CHANGES
1.95+40 -0 rpm/build/reqprov.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3592 -r1.3593 CHANGES
--- rpm/CHANGES 1 Apr 2011 07:29:51 - 1.3592
+++ rpm/CHANGES 1 Apr 2011 09:51:45 - 1.3593
@@ -1,4 +1,5 @@
5.4.0 - 5.4.1:
+- proyvind: mandriva: filter overlapping depencies.
- proyvind: rubygems.rb: add/provide ruby(abi) dependencies for non-gems.
- proyvind: rpmfc: add classifiers for gstreamer plugins dep generator.
- proyvind: use pythoneggs.py for python deps generated by internal
generator.
@@ .
patch -p0 '@@ .'
Index: rpm/build/reqprov.c
$ cvs diff -u -r1.94 -r1.95 reqprov.c
--- rpm/build/reqprov.c 16 Mar 2011 15:23:45 - 1.94
+++ rpm/build/reqprov.c 1 Apr 2011 09:51:45 - 1.95
@@ -103,9 +103,49 @@
len--;
if (strcmp(names[len], N))
continue;
+
+#if defined(RPM_VENDOR_MANDRIVA) /* filter-overlapping-dependencies */
+ /* XXX: Potential drawbacks? Need to study discuess this one a
+ * bit further, leaving under #ifdef for now...
+ * TODO: auto-generated deps too
+ */
+ if (flagtag versions != NULL) {
+ int overlap;
+
+ if(*EVR !*versions[len]) {
+ overlap = 1;
+ flags[len] = Flags;
+ he-tag = flagtag;
+ he-t = RPM_UINT32_TYPE;
+ he-p.argv = (void *) Flags;
+ xx = headerMod(h, he, 0);
+ } else {
+ EVR_t lEVR = rpmEVRnew(RPMSENSE_ANY, 0),
+ rEVR = rpmEVRnew(RPMSENSE_ANY, 0);
+
+ rpmEVRparse(EVR, lEVR);
+ rpmEVRparse(versions[len], rEVR);
+ lEVR-Flags = Flags | RPMSENSE_EQUAL;
+ rEVR-Flags = flags[len] | RPMSENSE_EQUAL;
+ overlap = rpmEVRoverlap(lEVR, rEVR);
+ lEVR = rpmEVRfree(lEVR);
+ rEVR = rpmEVRfree(rEVR);
+ }
+ if (overlap) {
+ versions[len] = EVR;
+ he-tag = versiontag;
+ he-t = RPM_STRING_ARRAY_TYPE;
+ he-p.argv = versions;
+ xx = headerMod(h, he, 0);
+ } else
+ continue;
+ }
+#else
if (flagtag versions != NULL
(strcmp(versions[len], EVR) || (rpmsenseFlags)flags[len] !=
Flags))
continue;
+#endif
+
if (indextag indexes != NULL indexes[len] != index)
continue;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/build/ reqprov.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 11:52:57
Branch: rpm-5_4 Handle: 2011040109525601
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/build reqprov.c
Log:
filter overlapping depencies. leaving under mandriva #ifdef for now,
need to properly determine 'correctness' sanity..
Summary:
RevisionChanges Path
1.3501.2.91 +1 -0 rpm/CHANGES
1.91.2.4+40 -0 rpm/build/reqprov.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.90 -r1.3501.2.91 CHANGES
--- rpm/CHANGES 1 Apr 2011 07:30:28 - 1.3501.2.90
+++ rpm/CHANGES 1 Apr 2011 09:52:56 - 1.3501.2.91
@@ -1,4 +1,5 @@
5.4.0 - 5.4.1:
+- proyvind: mandriva: filter overlapping depencies.
- proyvind: rubygems.rb: add/provide ruby(abi) dependencies for non-gems.
- proyvind: rpmfc: add classifiers for gstreamer plugins dep generator.
- proyvind: use pythoneggs.py for python deps generated by internal
generator.
@@ .
patch -p0 '@@ .'
Index: rpm/build/reqprov.c
$ cvs diff -u -r1.91.2.3 -r1.91.2.4 reqprov.c
--- rpm/build/reqprov.c 16 Mar 2011 15:24:06 - 1.91.2.3
+++ rpm/build/reqprov.c 1 Apr 2011 09:52:57 - 1.91.2.4
@@ -103,9 +103,49 @@
len--;
if (strcmp(names[len], N))
continue;
+
+#if defined(RPM_VENDOR_MANDRIVA) /* filter-overlapping-dependencies */
+ /* XXX: Potential drawbacks? Need to study discuess this one a
+ * bit further, leaving under #ifdef for now...
+ * TODO: auto-generated deps too
+ */
+ if (flagtag versions != NULL) {
+ int overlap;
+
+ if(*EVR !*versions[len]) {
+ overlap = 1;
+ flags[len] = Flags;
+ he-tag = flagtag;
+ he-t = RPM_UINT32_TYPE;
+ he-p.argv = (void *) Flags;
+ xx = headerMod(h, he, 0);
+ } else {
+ EVR_t lEVR = rpmEVRnew(RPMSENSE_ANY, 0),
+ rEVR = rpmEVRnew(RPMSENSE_ANY, 0);
+
+ rpmEVRparse(EVR, lEVR);
+ rpmEVRparse(versions[len], rEVR);
+ lEVR-Flags = Flags | RPMSENSE_EQUAL;
+ rEVR-Flags = flags[len] | RPMSENSE_EQUAL;
+ overlap = rpmEVRoverlap(lEVR, rEVR);
+ lEVR = rpmEVRfree(lEVR);
+ rEVR = rpmEVRfree(rEVR);
+ }
+ if (overlap) {
+ versions[len] = EVR;
+ he-tag = versiontag;
+ he-t = RPM_STRING_ARRAY_TYPE;
+ he-p.argv = versions;
+ xx = headerMod(h, he, 0);
+ } else
+ continue;
+ }
+#else
if (flagtag versions != NULL
(strcmp(versions[len], EVR) || (rpmsenseFlags)flags[len] !=
Flags))
continue;
+#endif
+
if (indextag indexes != NULL indexes[len] != index)
continue;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/build/ reqprov.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 11:53:29
Branch: rpm-5_3 Handle: 2011040109532801
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/build reqprov.c
Log:
filter overlapping depencies. leaving under mandriva #ifdef for now,
need to properly determine 'correctness' sanity..
Summary:
RevisionChanges Path
1.3296.2.194+1 -0 rpm/CHANGES
1.90.4.5+40 -0 rpm/build/reqprov.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.193 -r1.3296.2.194 CHANGES
--- rpm/CHANGES 1 Apr 2011 07:31:18 - 1.3296.2.193
+++ rpm/CHANGES 1 Apr 2011 09:53:28 - 1.3296.2.194
@@ -1,4 +1,5 @@
5.3.9 - 5.3.10
+- proyvind: mandriva: filter overlapping depencies.
- proyvind: rubygems.rb: add/provide ruby(abi) dependencies for non-gems.
- proyvind: rpmfc: add classifiers for gstreamer plugins dep generator.
- proyvind: use pythoneggs.py for python deps generated by internal
generator.
@@ .
patch -p0 '@@ .'
Index: rpm/build/reqprov.c
$ cvs diff -u -r1.90.4.4 -r1.90.4.5 reqprov.c
--- rpm/build/reqprov.c 16 Mar 2011 15:24:17 - 1.90.4.4
+++ rpm/build/reqprov.c 1 Apr 2011 09:53:29 - 1.90.4.5
@@ -103,9 +103,49 @@
len--;
if (strcmp(names[len], N))
continue;
+
+#if defined(RPM_VENDOR_MANDRIVA) /* filter-overlapping-dependencies */
+ /* XXX: Potential drawbacks? Need to study discuess this one a
+ * bit further, leaving under #ifdef for now...
+ * TODO: auto-generated deps too
+ */
+ if (flagtag versions != NULL) {
+ int overlap;
+
+ if(*EVR !*versions[len]) {
+ overlap = 1;
+ flags[len] = Flags;
+ he-tag = flagtag;
+ he-t = RPM_UINT32_TYPE;
+ he-p.argv = (void *) Flags;
+ xx = headerMod(h, he, 0);
+ } else {
+ EVR_t lEVR = rpmEVRnew(RPMSENSE_ANY, 0),
+ rEVR = rpmEVRnew(RPMSENSE_ANY, 0);
+
+ rpmEVRparse(EVR, lEVR);
+ rpmEVRparse(versions[len], rEVR);
+ lEVR-Flags = Flags | RPMSENSE_EQUAL;
+ rEVR-Flags = flags[len] | RPMSENSE_EQUAL;
+ overlap = rpmEVRoverlap(lEVR, rEVR);
+ lEVR = rpmEVRfree(lEVR);
+ rEVR = rpmEVRfree(rEVR);
+ }
+ if (overlap) {
+ versions[len] = EVR;
+ he-tag = versiontag;
+ he-t = RPM_STRING_ARRAY_TYPE;
+ he-p.argv = versions;
+ xx = headerMod(h, he, 0);
+ } else
+ continue;
+ }
+#else
if (flagtag versions != NULL
(strcmp(versions[len], EVR) || (rpmsenseFlags)flags[len] !=
Flags))
continue;
+#endif
+
if (indextag indexes != NULL indexes[len] != index)
continue;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/build/ reqprov.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 01-Apr-2011 12:39:36 Branch: HEAD Handle: 2011040110393500 Modified files: rpm/build reqprov.c Log: skip overlapping packages with lesser EVR Summary: RevisionChanges Path 1.96+3 -0 rpm/build/reqprov.c patch -p0 '@@ .' Index: rpm/build/reqprov.c $ cvs diff -u -r1.95 -r1.96 reqprov.c --- rpm/build/reqprov.c 1 Apr 2011 09:51:45 - 1.95 +++ rpm/build/reqprov.c 1 Apr 2011 10:39:35 - 1.96 @@ -128,6 +128,9 @@ lEVR-Flags = Flags | RPMSENSE_EQUAL; rEVR-Flags = flags[len] | RPMSENSE_EQUAL; overlap = rpmEVRoverlap(lEVR, rEVR); + if (!overlap) + if (rpmEVRoverlap(rEVR, lEVR)) + duplicate = 1; lEVR = rpmEVRfree(lEVR); rEVR = rpmEVRfree(rEVR); } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/build/ reqprov.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 01-Apr-2011 12:39:50 Branch: rpm-5_4 Handle: 2011040110395000 Modified files: (Branch: rpm-5_4) rpm/build reqprov.c Log: skip overlapping packages with lesser EVR Summary: RevisionChanges Path 1.91.2.5+3 -0 rpm/build/reqprov.c patch -p0 '@@ .' Index: rpm/build/reqprov.c $ cvs diff -u -r1.91.2.4 -r1.91.2.5 reqprov.c --- rpm/build/reqprov.c 1 Apr 2011 09:52:57 - 1.91.2.4 +++ rpm/build/reqprov.c 1 Apr 2011 10:39:50 - 1.91.2.5 @@ -128,6 +128,9 @@ lEVR-Flags = Flags | RPMSENSE_EQUAL; rEVR-Flags = flags[len] | RPMSENSE_EQUAL; overlap = rpmEVRoverlap(lEVR, rEVR); + if (!overlap) + if (rpmEVRoverlap(rEVR, lEVR)) + duplicate = 1; lEVR = rpmEVRfree(lEVR); rEVR = rpmEVRfree(rEVR); } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/build/ reqprov.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 01-Apr-2011 12:40:16 Branch: rpm-5_3 Handle: 2011040110401600 Modified files: (Branch: rpm-5_3) rpm/build reqprov.c Log: skip overlapping packages with lesser EVR Summary: RevisionChanges Path 1.90.4.6+3 -0 rpm/build/reqprov.c patch -p0 '@@ .' Index: rpm/build/reqprov.c $ cvs diff -u -r1.90.4.5 -r1.90.4.6 reqprov.c --- rpm/build/reqprov.c 1 Apr 2011 09:53:29 - 1.90.4.5 +++ rpm/build/reqprov.c 1 Apr 2011 10:40:16 - 1.90.4.6 @@ -128,6 +128,9 @@ lEVR-Flags = Flags | RPMSENSE_EQUAL; rEVR-Flags = flags[len] | RPMSENSE_EQUAL; overlap = rpmEVRoverlap(lEVR, rEVR); + if (!overlap) + if (rpmEVRoverlap(rEVR, lEVR)) + duplicate = 1; lEVR = rpmEVRfree(lEVR); rEVR = rpmEVRfree(rEVR); } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmfc.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 14:27:28
Branch: HEAD Handle: 2011040112272800
Modified files:
rpm/lib rpmfc.c
Log:
filter overlapping auto generated dependencies as well under mandriva
#ifdef
Summary:
RevisionChanges Path
1.79+26 -0 rpm/lib/rpmfc.c
patch -p0 '@@ .'
Index: rpm/lib/rpmfc.c
$ cvs diff -u -r1.78 -r1.79 rpmfc.c
--- rpm/lib/rpmfc.c 1 Apr 2011 05:08:12 - 1.78
+++ rpm/lib/rpmfc.c 1 Apr 2011 12:27:28 - 1.79
@@ -513,6 +513,32 @@
ds = rpmdsSingle(tagN, N, EVR, Flags);
+#if defined(RPM_VENDOR_MANDRIVA) /* filter-overlapping-dependencies */
+ int overlap = 0;
+ if (*depsp) {
+ int ix = rpmdsSearch(*depsp, ds);
+ if (ix = 0) {
+ EVR_t lEVR = rpmEVRnew(RPMSENSE_ANY, 0),
+ rEVR = rpmEVRnew(RPMSENSE_ANY, 0);
+
+ rpmdsSetIx(*depsp, ix);
+
+ rpmEVRparse(rpmdsEVR(*depsp), lEVR);
+ rpmEVRparse(EVR, rEVR);
+ lEVR-Flags = rpmdsFlags(*depsp) | RPMSENSE_EQUAL;
+ rEVR-Flags = Flags | RPMSENSE_EQUAL;
+
+ if (rpmEVRcompare(lEVR, rEVR) 0) {
+ (*depsp)-EVR[(*depsp)-i] = EVR;
+ (*depsp)-Flags[(*depsp)-i] = Flags;
+ overlap = 1;
+ }
+ lEVR = rpmEVRfree(lEVR);
+ rEVR = rpmEVRfree(rEVR);
+ }
+ }
+ if (!overlap)
+#endif
/* Add to package dependencies. */
xx = rpmdsMerge(depsp, ds);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/lib/ rpmfc.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 14:27:47
Branch: rpm-5_4 Handle: 2011040112274700
Modified files: (Branch: rpm-5_4)
rpm/lib rpmfc.c
Log:
filter overlapping auto generated dependencies as well under mandriva
#ifdef
Summary:
RevisionChanges Path
1.75.2.4+26 -0 rpm/lib/rpmfc.c
patch -p0 '@@ .'
Index: rpm/lib/rpmfc.c
$ cvs diff -u -r1.75.2.3 -r1.75.2.4 rpmfc.c
--- rpm/lib/rpmfc.c 1 Apr 2011 05:16:21 - 1.75.2.3
+++ rpm/lib/rpmfc.c 1 Apr 2011 12:27:47 - 1.75.2.4
@@ -513,6 +513,32 @@
ds = rpmdsSingle(tagN, N, EVR, Flags);
+#if defined(RPM_VENDOR_MANDRIVA) /* filter-overlapping-dependencies */
+ int overlap = 0;
+ if (*depsp) {
+ int ix = rpmdsSearch(*depsp, ds);
+ if (ix = 0) {
+ EVR_t lEVR = rpmEVRnew(RPMSENSE_ANY, 0),
+ rEVR = rpmEVRnew(RPMSENSE_ANY, 0);
+
+ rpmdsSetIx(*depsp, ix);
+
+ rpmEVRparse(rpmdsEVR(*depsp), lEVR);
+ rpmEVRparse(EVR, rEVR);
+ lEVR-Flags = rpmdsFlags(*depsp) | RPMSENSE_EQUAL;
+ rEVR-Flags = Flags | RPMSENSE_EQUAL;
+
+ if (rpmEVRcompare(lEVR, rEVR) 0) {
+ (*depsp)-EVR[(*depsp)-i] = EVR;
+ (*depsp)-Flags[(*depsp)-i] = Flags;
+ overlap = 1;
+ }
+ lEVR = rpmEVRfree(lEVR);
+ rEVR = rpmEVRfree(rEVR);
+ }
+ }
+ if (!overlap)
+#endif
/* Add to package dependencies. */
xx = rpmdsMerge(depsp, ds);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES configure.ac rpm/js/ Makefile.am rpmaug-js.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 02-Apr-2011 04:01:53
Branch: HEAD Handle: 2011040202015300
Modified files:
rpm CHANGES configure.ac
rpm/js Makefile.am rpmaug-js.c
Log:
rpmjs: port to SpiderMonkey 1.8.5 API.
Summary:
RevisionChanges Path
1.3594 +1 -0 rpm/CHANGES
2.483 +4 -4 rpm/configure.ac
1.45+1 -1 rpm/js/Makefile.am
1.12+22 -16 rpm/js/rpmaug-js.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3593 -r1.3594 CHANGES
--- rpm/CHANGES 1 Apr 2011 09:51:45 - 1.3593
+++ rpm/CHANGES 2 Apr 2011 02:01:53 - 1.3594
@@ -1,4 +1,5 @@
5.4.0 - 5.4.1:
+- proyvind: rpmjs: port to SpiderMonkey 1.8.5 API.
- proyvind: mandriva: filter overlapping depencies.
- proyvind: rubygems.rb: add/provide ruby(abi) dependencies for non-gems.
- proyvind: rpmfc: add classifiers for gstreamer plugins dep generator.
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.482 -r2.483 configure.ac
--- rpm/configure.ac 1 Apr 2011 05:11:52 - 2.482
+++ rpm/configure.ac 2 Apr 2011 02:01:53 - 2.483
@@ -1609,12 +1609,12 @@
WITH_JS_SUBDIR=
WITH_SPIDERMONKEY_SUBDIR=
RPM_CHECK_LIB(
-[JavaScript], [js],
-[js], [JS_NewContext], [jsapi.h],
-[no,internal:external:none], [js:src:src],
+[JavaScript], [mozjs185],
+[mozjs185], [JS_NewContext], [jsapi.h],
+[no,internal:external:none], [mozjs185:src:src],
[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
WITH_SPIDERMONKEY_SUBDIR=$WITH_JS_SUBDIR/src
- AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'js' library
(-ljs).])
+ AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'mozjs185'
library (-lmozjs185).])
else
WITH_JS_SUBDIR=js
fi
@@ .
patch -p0 '@@ .'
Index: rpm/js/Makefile.am
$ cvs diff -u -r1.44 -r1.45 Makefile.am
--- rpm/js/Makefile.am18 Sep 2010 14:12:57 - 1.44
+++ rpm/js/Makefile.am2 Apr 2011 02:01:53 - 1.45
@@ -22,7 +22,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
- @WITH_JS_CPPFLAGS@ \
+ @WITH_MOZJS185_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
@WITH_GPSEE_CPPFLAGS@ \
@WITH_SYCK_CPPFLAGS@ \
@@ .
patch -p0 '@@ .'
Index: rpm/js/rpmaug-js.c
$ cvs diff -u -r1.11 -r1.12 rpmaug-js.c
--- rpm/js/rpmaug-js.c10 Jan 2010 18:29:12 - 1.11
+++ rpm/js/rpmaug-js.c2 Apr 2011 02:01:53 - 1.12
@@ -303,18 +303,18 @@
}
static JSFunctionSpec rpmaug_funcs[] = {
-JS_FS(defvar, rpmaug_defvar, 0,0,0),
-JS_FS(get, rpmaug_get, 0,0,0),
-JS_FS(set, rpmaug_set, 0,0,0),
-JS_FS(insert, rpmaug_insert, 0,0,0),
-JS_FS(rm, rpmaug_rm, 0,0,0),
-JS_FS(remove, rpmaug_rm, 0,0,0),
-JS_FS(mv, rpmaug_mv, 0,0,0),
-JS_FS(move,rpmaug_mv, 0,0,0),
-JS_FS(match, rpmaug_match, 0,0,0),
-JS_FS(save,rpmaug_save,0,0,0),
-JS_FS(load,rpmaug_load,0,0,0),
-JS_FS(print, rpmaug_print, 0,0,0),
+JS_FS(defvar, rpmaug_defvar, 0,0),
+JS_FS(get, rpmaug_get, 0,0),
+JS_FS(set, rpmaug_set, 0,0),
+JS_FS(insert, rpmaug_insert, 0,0),
+JS_FS(rm, rpmaug_rm, 0,0),
+JS_FS(remove, rpmaug_rm, 0,0),
+JS_FS(mv, rpmaug_mv, 0,0),
+JS_FS(move,rpmaug_mv, 0,0),
+JS_FS(match, rpmaug_match, 0,0),
+JS_FS(save,rpmaug_save,0,0),
+JS_FS(load,rpmaug_load,0,0),
+JS_FS(print, rpmaug_print, 0,0),
JS_FS_END
};
@@ -515,25 +515,31 @@
}
static JSBool
-rpmaug_ctor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval
*rval)
+rpmaug_ctor( JSContext* cx, uintN argc, jsval*
