[CVS] RPM: rpm-5_4: rpm/lib/ tevr.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 01-Jul-2017 06:04:25
Branch: rpm-5_4 Handle: 2017070104042500
Modified files: (Branch: rpm-5_4)
rpm/lib tevr.c
Log:
- argv: add 3rd arg to trim input.
Summary:
RevisionChanges Path
2.5.4.5 +1 -1 rpm/lib/tevr.c
patch -p0 <<'@@ .'
Index: rpm/lib/tevr.c
$ cvs diff -u -r2.5.4.4 -r2.5.4.5 tevr.c
--- rpm/lib/tevr.c16 May 2017 18:29:12 - 2.5.4.4
+++ rpm/lib/tevr.c1 Jul 2017 04:04:25 - 2.5.4.5
@@ -160,7 +160,7 @@
if (ac == 0 || !strcmp(*av, "-")) {
av = NULL;
- xx = argvFgets(, NULL);
+ xx = argvFgets(, NULL, 0);
ac = argvCount(av);
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/scripts/ Makefile.am brp-java-gcj...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 01-Jul-2017 06:25:13
Branch: rpm-5_4 Handle: 2601005436539062237
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/scripts Makefile.am
Removed files:(Branch: rpm-5_4)
rpm/scripts brp-java-gcjcompile brp-sparc64-linux
check-multiarch-files mkmultiarch
multiarch-dispatch multiarch-dispatch.h
multiarch-platform
Log:
- jbj: scripts: get rid of unused
(http://rpm5.org/community/rpm-devel/5697.html)
Summary:
RevisionChanges Path
1.3501.2.579+1 -0 rpm/CHANGES
1.75.2.25 +4 -12 rpm/scripts/Makefile.am
1.3 +0 -41 rpm/scripts/brp-java-gcjcompile
1.2 +0 -41 rpm/scripts/brp-sparc64-linux
1.2 +0 -91 rpm/scripts/check-multiarch-files
1.1 +0 -91 rpm/scripts/mkmultiarch
1.1 +0 -31 rpm/scripts/multiarch-dispatch
1.1 +0 -172rpm/scripts/multiarch-dispatch.h
1.1 +0 -14 rpm/scripts/multiarch-platform
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.578 -r1.3501.2.579 CHANGES
--- rpm/CHANGES 20 Jun 2017 07:39:06 - 1.3501.2.578
+++ rpm/CHANGES 1 Jul 2017 04:25:13 - 1.3501.2.579
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: scripts: get rid of unused
(http://rpm5.org/community/rpm-devel/5697.html)
- jbj: argv: attempt input trimming in argvFgets (if requested).
- jbj: rpmeio: stub in libeio wrapper(s).
- jbj: rpmev: stub in libev wrapper(s).
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
$ cvs diff -u -r1.75.2.24 -r1.75.2.25 Makefile.am
--- rpm/scripts/Makefile.am 18 Sep 2014 05:07:03 - 1.75.2.24
+++ rpm/scripts/Makefile.am 1 Jul 2017 04:25:13 - 1.75.2.25
@@ -6,9 +6,9 @@
makeshlibs
EXTRA_DIST = api-sanity-autotest.pl api-sanity-checker.pl \
- brp-compress brp-python-bytecompile brp-java-gcjcompile \
+ brp-compress brp-python-bytecompile \
brp-strip brp-strip-comment-note brp-nobuildrootpath \
- brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
+ brp-strip-shared brp-strip-static-archive \
brp-implant-ident-static brp-java-repack-jars \
check-files cross-build dbconvert.sh \
deb_Packages deb_Sources \
@@ -23,8 +23,6 @@
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 \
- multiarch-dispatch.h mkmultiarch gem_helper.rb \
URPM-Makefile.PL.in URPM-Makefile.am \
nix_meta \
osgideps.pl pkgconfigdeps.sh \
@@ -48,16 +46,14 @@
noinst_SCRIPTS =
-noinst_SCRIPTS += multiarch-dispatch multiarch-platform
bin_SCRIPTS = gendiff
-noinst_SCRIPTS += check-multiarch-files mkmultiarch
pkgdir = @USRLIBRPM@
pkg_SCRIPTS = \
- brp-compress brp-python-bytecompile brp-java-gcjcompile \
+ brp-compress brp-python-bytecompile \
brp-strip brp-strip-comment-note brp-nobuildrootpath \
- brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
+ brp-strip-shared brp-strip-static-archive \
check-files cross-build dbconvert.sh executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
find-provides.perl \
@@ -95,9 +91,6 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rpm.pc
-pkgincdir = $(includedir)
-noinst_HEADERS = multiarch-dispatch.h
-
install-exec-hook:
if WITH_PATH_VERSIONED
-for p in $(bin_SCRIPTS); do \
@@ -112,4 +105,3 @@
`echo "$(DESTDIR)$(pkgconfigdir)/$${p}" | sed
's/\.\([^.]*\)$$/-$(VERSION).\1/'`; \
done
endif
-
@@ .
rm -f rpm/scripts/brp-java-gcjcompile <<'@@ .'
Index: rpm/scripts/brp-java-gcjcompile
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f rpm/scripts/brp-sparc64-linux <<'@@ .'
Index: rpm/scripts/brp-sparc64-linux
[NO CHANGE SUMMARY
[CVS] RPM: rpm-5_4: rpm/tests/ thkp.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 01-Jul-2017 06:46:08 Branch: rpm-5_4 Handle: 2017070104460800 Modified files: (Branch: rpm-5_4) rpm/tests thkp.c Log: - argv: add 3rd argument to controll trimming input. Summary: RevisionChanges Path 1.1.4.9 +1 -1 rpm/tests/thkp.c patch -p0 <<'@@ .' Index: rpm/tests/thkp.c $ cvs diff -u -r1.1.4.8 -r1.1.4.9 thkp.c --- rpm/tests/thkp.c 16 Feb 2015 21:45:17 - 1.1.4.8 +++ rpm/tests/thkp.c 1 Jul 2017 04:46:08 - 1.1.4.9 @@ -173,7 +173,7 @@ if (gotstdin) continue; gotstdin++; - if (argvFgets(, NULL)) + if (argvFgets(, NULL, 0)) goto exit; } } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/scripts/ brp-compress
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 01-Jul-2017 06:32:21
Branch: rpm-5_4 Handle: 2017070104322000
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/scripts brp-compress
Log:
- scripts: honor COMPRESS envvar (if set)
(http://rpm5.org/community/rpm-devel/5698.html)
Summary:
RevisionChanges Path
1.3501.2.580+1 -0 rpm/CHANGES
1.13.10.4 +2 -2 rpm/scripts/brp-compress
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.579 -r1.3501.2.580 CHANGES
--- rpm/CHANGES 1 Jul 2017 04:25:13 - 1.3501.2.579
+++ rpm/CHANGES 1 Jul 2017 04:32:20 - 1.3501.2.580
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: scripts: honor COMPRESS envvar (if set)
(http://rpm5.org/community/rpm-devel/5698.html)
- jbj: scripts: get rid of unused
(http://rpm5.org/community/rpm-devel/5697.html)
- jbj: argv: attempt input trimming in argvFgets (if requested).
- jbj: rpmeio: stub in libeio wrapper(s).
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/brp-compress
$ cvs diff -u -r1.13.10.3 -r1.13.10.4 brp-compress
--- rpm/scripts/brp-compress 28 Mar 2016 22:02:51 - 1.13.10.3
+++ rpm/scripts/brp-compress 1 Jul 2017 04:32:20 - 1.13.10.4
@@ -8,8 +8,8 @@
cd "$RPM_BUILD_ROOT"
# Compress man pages
-COMPRESS="gzip -9 -n"
-COMPRESS_EXT=.gz
+COMPRESS=${COMPRESS:-gzip -9 -n}
+COMPRESS_EXT=${COMPRESS_EXT:-.gz}
for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in mandri...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 01-Jul-2017 06:35:47
Branch: rpm-5_4 Handle: 2017070104354700
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros macros.rpmbuild.in mandriva.in
Log:
- macros: update %efi (http://rpm5.org/community/rpm-devel/5699.html).
Summary:
RevisionChanges Path
1.3501.2.581+1 -0 rpm/CHANGES
1.4.4.21+5 -4 rpm/macros/macros.rpmbuild.in
1.7.2.24+6 -10 rpm/macros/mandriva.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.580 -r1.3501.2.581 CHANGES
--- rpm/CHANGES 1 Jul 2017 04:32:20 - 1.3501.2.580
+++ rpm/CHANGES 1 Jul 2017 04:35:47 - 1.3501.2.581
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: macros: update %efi
(http://rpm5.org/community/rpm-devel/5699.html)/
- jbj: scripts: honor COMPRESS envvar (if set)
(http://rpm5.org/community/rpm-devel/5698.html)
- jbj: scripts: get rid of unused
(http://rpm5.org/community/rpm-devel/5697.html)
- jbj: argv: attempt input trimming in argvFgets (if requested).
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.rpmbuild.in
$ cvs diff -u -r1.4.4.20 -r1.4.4.21 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 17 Sep 2014 03:00:52 - 1.4.4.20
+++ rpm/macros/macros.rpmbuild.in 1 Jul 2017 04:35:47 - 1.4.4.21
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.4.20 2014/09/17 03:00:52 jbj Exp $
+# $Id: macros.rpmbuild.in,v 1.4.4.21 2017/07/01 04:35:47 jbj Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -669,9 +669,6 @@
#
%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
-# arch macro for all EFI-compatible architectures
-%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 armv7l armv7hl armv7lh armv7hln
armv7hnl armv7lhn armv7lnh armv7nhl armv7nlh
@@ -692,6 +689,10 @@
%mipsel mipsel mips2el mips3el mips4el loongson2e loongson2f octeonel
%mipsx %mips %mipsel mips64 mips64el
+
+# arch macro for all EFI-compatible architectures
+%efi %{ix86} x86_64 ia64 %{arm} aarch64
+
#
# Use in %install to generate locale specific file lists. For example,
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/mandriva.in
$ cvs diff -u -r1.7.2.23 -r1.7.2.24 mandriva.in
--- rpm/macros/mandriva.in20 Jul 2012 15:02:58 - 1.7.2.23
+++ rpm/macros/mandriva.in1 Jul 2017 04:35:47 - 1.7.2.24
@@ -1,7 +1,7 @@
-%distributionMandriva Linux
-%vendor Mandriva
-%bugurl http://qa.mandriva.com
-%disturl http://mandriva.org
+%distributionOpenMandriva Lx
+%vendor OpenMandriva
+%bugurl http://issues.openmandriva.org/
+%disturl http://openmandriva.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
@@ -32,11 +32,6 @@
# mdvbz#64914
%_rpmgio .ufdio
-# 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.
%evr_tuple_select1234
@@ -133,8 +128,9 @@
%_enable_debug_packages 1
-# Default extension to use (for info files)
+# Default extension to use (for man & info files)
%_extension .xz
+%_compress xz -0f --text -T0
# Macro: %{mklibname [ []] [-s] [-d]}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmjs45.cpp
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 01-Jul-2017 06:00:08
Branch: rpm-5_4 Handle: 2017070104000700
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmjs45.cpp
Log:
- rpmjs45: sanity.
Summary:
RevisionChanges Path
1.1.2.13+1 -3 rpm/rpmio/rpmjs45.cpp
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs45.cpp
$ cvs diff -u -r1.1.2.12 -r1.1.2.13 rpmjs45.cpp
--- rpm/rpmio/rpmjs45.cpp 28 Jun 2017 09:54:15 - 1.1.2.12
+++ rpm/rpmio/rpmjs45.cpp 1 Jul 2017 04:00:07 - 1.1.2.13
@@ -2846,8 +2846,6 @@
JSContext* cx = I->cx;
JSObject* global = I->global;
-bool ok;
-
JS::RootedValue rval(cx);
{// Scope for JSAutoCompartment
@@ -2855,8 +2853,8 @@
JS::CompileOptions opts(cx);
opts.setFileAndLine(fn, ln);
- ok = JS::Evaluate(cx, opts, script, strlen(script), );
+ bool ok = JS::Evaluate(cx, opts, script, strlen(script), );
if (!ok)
return 1;
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
