testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=66

Browse Source
This commit is contained in:
OBS User unknown 2008-11-28 15:19:38 +00:00 committed by Git OBS Bridge
parent 06ea39905c
commit a4b6681cdd
6 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
finddebuginfo-absolute-links.diff
View File

@ -12,8 +12,8 @@ Signed-off-by: Jan Blunck <jblunck@suse.de>
Index: b/scripts/find-debuginfo.sh Index: b/scripts/find-debuginfo.sh
=================================================================== ===================================================================
--- a/scripts/find-debuginfo.sh --- scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh +++ scripts/find-debuginfo.sh
@@ -123,7 +123,17 @@ debug_link() @@ -123,7 +123,17 @@ debug_link()
local l="/usr/lib/debug$2" local l="/usr/lib/debug$2"
local t="$1" local t="$1"

12
rpm-filelist-bufferoverflow.diff Normal file
View File

@ -0,0 +1,12 @@
--- build/files.c
+++ build/files.c
@@ -2053,7 +2053,8 @@ static int processPackageFiles(Spec spec, Package pkg,
continue;
fileName = NULL;
/*@-nullpass@*/ /* LCL: buf is NULL ?!? */
- strcpy(buf, s);
+ strncpy(buf, s, sizeof(buf)-1);
+ buf[sizeof(buf)-1] = '\0';
/*@=nullpass@*/
/* Reset for a new line in %files */

2
rpm-python.spec
View File

@ -24,7 +24,7 @@ License: GPL v2 or later
Group: System/Packages Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2.3 Version: 4.4.2.3
Release: 18 Release: 19
Requires: rpm = %{version} Requires: rpm = %{version}
%py_requires %py_requires
Source99: rpm.spec Source99: rpm.spec

5
rpm-suse_macros
View File

@ -366,6 +366,11 @@
%cflags_profile_generate -fprofile-generate %cflags_profile_generate -fprofile-generate
%cflags_profile_feedback -fprofile-use %cflags_profile_feedback -fprofile-use
%suse_install_update_message() \
install -D -m 644 %1 %buildroot/var/adm/update-messages/%{name}-%{version}-%{release}-%(basename %1).txt
%suse_install_update_script() \
install -D -m 755 %1 %buildroot/var/adm/update-scripts/%{name}-%{version}-%{release}-%(basename %1).txt
# Template for lang sub-package. # Template for lang sub-package.
%lang_package(n:) \ %lang_package(n:) \
%package %{-n:-n %{-n*}-}lang \ %package %{-n:-n %{-n*}-}lang \

7
rpm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 28 15:15:10 CET 2008 - dmueller@suse.de
- fix build
- fix stack based buffer overflow in filelist parsing (bnc#397006)
- add macros for update messages and update scripts
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 28 14:46:04 CET 2008 - mls@suse.de Fri Nov 28 14:46:04 CET 2008 - mls@suse.de

13
rpm.spec
View File

@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on AutoReqProv: on
Summary: The RPM Package Manager Summary: The RPM Package Manager
Version: 4.4.2.3 Version: 4.4.2.3
Release: 18 Release: 19
Source: rpm-%{version}.tar.bz2 Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2 Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2 Source2: RPM-Tips.html.tar.bz2
@ -96,6 +96,7 @@ Patch62: fingerprint.diff
Patch63: finddebuginfo-absolute-links.diff Patch63: finddebuginfo-absolute-links.diff
Patch64: firmware.diff Patch64: firmware.diff
Patch65: specfilemacro.diff Patch65: specfilemacro.diff
Patch66: rpm-filelist-bufferoverflow.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
# avoid bootstrapping problem # avoid bootstrapping problem
@ -179,7 +180,7 @@ rm -f rpmdb/db.h
%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49 %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66
chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-supplements{,.ksyms}
chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
chmod 755 scripts/firmware.prov chmod 755 scripts/firmware.prov
@ -329,7 +330,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 466 Release: 467
# #
%description -n popt %description -n popt
@ -352,7 +353,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 466 Release: 467
Requires: popt = 1.7 Requires: popt = 1.7
Requires: glibc-devel Requires: glibc-devel
@ -387,6 +388,10 @@ Authors:
%doc %{_mandir}/man3/popt.3* %doc %{_mandir}/man3/popt.3*
%changelog %changelog
* Fri Nov 28 2008 dmueller@suse.de
- fix build
- fix stack based buffer overflow in filelist parsing (bnc#397006)
- add macros for update messages and update scripts
* Fri Nov 28 2008 mls@suse.de * Fri Nov 28 2008 mls@suse.de
- disable debug package requires for now, they cause more harm - disable debug package requires for now, they cause more harm
than benefits than benefits