Discussion:
applying security patch to package.
d***@velocitynet.com.au
2014-08-01 09:20:45 UTC
Permalink
Hello,
Can a security patch be applied to a package.
Thank you
--Glenn

Details as follows:
from http://www.cacti.net/download_patches.php

wget http://www.cacti.net/downloads/patches/0.8.8b/security.patch
patch -p1 -N < security.patch

Package spec file:
https://build.opensuse.org/package/view_file/server:monitoring/cacti/cacti.spec?expand=1
--
To unsubscribe, e-mail: opensuse-packaging+***@opensuse.org
To contact the owner, e-mail: opensuse-packaging+***@opensuse.org
Dominique Leuenberger a.k.a. Dimstar
2014-08-01 08:57:03 UTC
Permalink
Post by d***@velocitynet.com.au
Hello,
Can a security patch be applied to a package.
Thank you
--Glenn
from http://www.cacti.net/download_patches.php
wget http://www.cacti.net/downloads/patches/0.8.8b/security.patch
patch -p1 -N < security.patch
https://build.opensuse.org/package/view_file/server:monitoring/cacti/cacti.spec?expand=1
You seem to be capable of doing this.. branch the package, add the
patch, resubmit it.

Dominique
--
To unsubscribe, e-mail: opensuse-packaging+***@opensuse.org
To contact the owner, e-mail: opensuse-packaging+***@opensuse.org
d***@velocitynet.com.au
2014-08-02 05:03:49 UTC
Permalink
On Fri, 01 Aug 2014 08:57:03 +0000, "Dominique Leuenberger a.k.a. Dimstar"
Post by Dominique Leuenberger a.k.a. Dimstar
Post by d***@velocitynet.com.au
Hello,
Can a security patch be applied to a package.
Thank you
--Glenn
from http://www.cacti.net/download_patches.php
wget http://www.cacti.net/downloads/patches/0.8.8b/security.patch
patch -p1 -N < security.patch
https://build.opensuse.org/package/view_file/server:monitoring/cacti/cacti.spec?expand=1
Post by Dominique Leuenberger a.k.a. Dimstar
You seem to be capable of doing this.. branch the package, add the
patch, resubmit it.
Dominique
Hello,
The build failed.

How is it fixed? I'm thinking some of the other may not be needed. unsure
which ones.
--Glenn

-- spec file used.
https://build.opensuse.org/package/view_file/home:doiggl/cacti/cacti.spec?expand=1

# http://www.cacti.net/downloads/patches/0.8.8b/security.patch
Patch4: security.patch
%patch4 -p1

build log

[ 44s] Patch #4 (security.patch):
[ 44s] + /usr/bin/cat /home/abuild/rpmbuild/SOURCES/security.patch
[ 44s] + /usr/bin/patch -p1 --fuzz=0
[ 44s] patching file cdef.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 1 out of 1 hunk ignored -- saving rejects to file cdef.php.rej
[ 44s] patching file graph_xport.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 1 out of 1 hunk ignored -- saving rejects to file
graph_xport.php.rej
[ 44s] patching file lib/graph_export.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 2 out of 2 hunks ignored -- saving rejects to file
lib/graph_export.php.rej
[ 44s] patching file lib/rrd.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 3 out of 3 hunks ignored -- saving rejects to file
lib/rrd.php.rej
[ 44s] error: Bad exit status from /var/tmp/rpm-tmp.P5jFSK (%prep)
[ 44s]
[ 44s]
[ 44s] RPM build errors:
[ 44s] Bad exit status from /var/tmp/rpm-tmp.P5jFSK (%prep)
[ 44s] ### WATCHDOG MARKER START ###
[ 47s] [ 32.810980] SysRq : Power Off
[ 47s] [ 32.813335] reboot: Power down
[ 59s] ### WATCHDOG MARKER END ###
--
To unsubscribe, e-mail: opensuse-packaging+***@opensuse.org
To contact the owner, e-mail: opensuse-packaging+***@opensuse.org
Andrey Borzenkov
2014-08-02 05:52:09 UTC
Permalink
В Sat, 02 Aug 2014 15:03:49 +1000
Post by d***@velocitynet.com.au
On Fri, 01 Aug 2014 08:57:03 +0000, "Dominique Leuenberger a.k.a. Dimstar"
Post by Dominique Leuenberger a.k.a. Dimstar
Post by d***@velocitynet.com.au
Hello,
Can a security patch be applied to a package.
Thank you
--Glenn
from http://www.cacti.net/download_patches.php
wget http://www.cacti.net/downloads/patches/0.8.8b/security.patch
patch -p1 -N < security.patch
https://build.opensuse.org/package/view_file/server:monitoring/cacti/cacti.spec?expand=1
Post by Dominique Leuenberger a.k.a. Dimstar
You seem to be capable of doing this.. branch the package, add the
patch, resubmit it.
Dominique
Hello,
The build failed.
How is it fixed?
Package already includes patch you are trying to add. Nothing to fix
here.

Did you try to patch manually before building?
Post by d***@velocitynet.com.au
I'm thinking some of the other may not be needed. unsure
which ones.
--Glenn
-- spec file used.
https://build.opensuse.org/package/view_file/home:doiggl/cacti/cacti.spec?expand=1
# http://www.cacti.net/downloads/patches/0.8.8b/security.patch
Patch4: security.patch
%patch4 -p1
build log
[ 44s] + /usr/bin/cat /home/abuild/rpmbuild/SOURCES/security.patch
[ 44s] + /usr/bin/patch -p1 --fuzz=0
[ 44s] patching file cdef.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 1 out of 1 hunk ignored -- saving rejects to file cdef.php.rej
[ 44s] patching file graph_xport.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 1 out of 1 hunk ignored -- saving rejects to file
graph_xport.php.rej
[ 44s] patching file lib/graph_export.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 2 out of 2 hunks ignored -- saving rejects to file
lib/graph_export.php.rej
[ 44s] patching file lib/rrd.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 3 out of 3 hunks ignored -- saving rejects to file
lib/rrd.php.rej
[ 44s] error: Bad exit status from /var/tmp/rpm-tmp.P5jFSK (%prep)
[ 44s]
[ 44s]
[ 44s] Bad exit status from /var/tmp/rpm-tmp.P5jFSK (%prep)
[ 44s] ### WATCHDOG MARKER START ###
[ 47s] [ 32.810980] SysRq : Power Off
[ 47s] [ 32.813335] reboot: Power down
[ 59s] ### WATCHDOG MARKER END ###
--
To unsubscribe, e-mail: opensuse-packaging+***@opensuse.org
To contact the owner, e-mail: opensuse-packaging+***@opensuse.org
d***@velocitynet.com.au
2014-08-02 06:50:27 UTC
Permalink
On Fri, 01 Aug 2014 08:57:03 +0000, "Dominique Leuenberger a.k.a. Dimstar"
Post by Dominique Leuenberger a.k.a. Dimstar
Post by d***@velocitynet.com.au
Hello,
Can a security patch be applied to a package.
Thank you
--Glenn
from http://www.cacti.net/download_patches.php
wget http://www.cacti.net/downloads/patches/0.8.8b/security.patch
patch -p1 -N < security.patch
https://build.opensuse.org/package/view_file/server:monitoring/cacti/cacti.spec?expand=1
Post by Dominique Leuenberger a.k.a. Dimstar
You seem to be capable of doing this.. branch the package, add the
patch, resubmit it.
Dominique
Hello,
I found out the following.
Question.
- How do I submit it for review ?
--Thanks Glenn


#This combination does build:

%prep
%setup -q
%patch0 -p1
%patch1 -p1
#%patch2 -p1
%patch3 -p3
%patch4 -p1

#This combination does NOT build:

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
#%patch3 -p3
%patch4 -p1


Other details:
passed build log
[ 70s] 2 packages and 0 specfiles checked; 0 errors, 34 warnings.
[ 70s]
[ 70s] ... creating baselibs
[ 70s] ... comparing built packages with the former built
[ 70s] /usr/lib/build/rpm-check.sh
[ 70s] compare /.build.oldpackages/cacti-0.8.8b-33.1.src.rpm
/home/abuild/rpmbuild/SRPMS/cacti-0.8.8b-35.1.src.rpm
[ 70s] --- /tmp/tmp.Vig6VwdkDZ 2014-08-02 06:37:26.516828624 +0000
[ 70s] +++ /tmp/tmp.LTzXpGqUVj 2014-08-02 06:37:26.532828624 +0000
[ 70s] @@ -7,7 +7,7 @@
[ 70s] ina database, Cacti also handles data gathering. There exists an
SNMP
[ 70s] support for those accustomed to creating traffic graphs with
MRTG as
[ 70s] well.
[ 70s] - obs://build.opensuse.org/home:doiggl home:doiggl /
openSUSE_Factory
obs://build.opensuse.org/home:doiggl/openSUSE_Factory/929297a54618d3912a13c41d71179056-cacti
GPL-2.0+ GPL-2.0+
[ 70s] + obs://build.opensuse.org/home:doiggl home:doiggl /
openSUSE_Factory
obs://build.opensuse.org/home:doiggl/openSUSE_Factory/994d3fd89456d7a6d9b87b60225c5654-cacti
GPL-2.0+ GPL-2.0+
[ 70s] System/Monitoring http://www.cacti.net/ (none) (none) (none)
[ 70s] (none) 4.11.2 (none)
[ 70s] cpio gzip 9
[ 70s] RPM meta information is different
[ 70s] ... saving statistics
[ 70s] ... saving built packages
[ 70s] RPMS/noarch/cacti-0.8.8b-35.1.noarch.rpm
[ 70s] SRPMS/cacti-0.8.8b-35.1.src.rpm
[ 70s] OTHER/_statistics
[ 70s] OTHER/rpmlint.log
[ 70s]
[ 70s] build05 finished "build cacti.spec" at Sat Aug 2 06:37:26 UTC
2014.
[

failed build log example

[ 44s] Patch #4 (security.patch):
[ 44s] + /usr/bin/cat /home/abuild/rpmbuild/SOURCES/security.patch
[ 44s] + /usr/bin/patch -p1 --fuzz=0
[ 44s] patching file cdef.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 1 out of 1 hunk ignored -- saving rejects to file cdef.php.rej
[ 44s] patching file graph_xport.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 1 out of 1 hunk ignored -- saving rejects to file
graph_xport.php.rej
[ 44s] patching file lib/graph_export.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 2 out of 2 hunks ignored -- saving rejects to file
lib/graph_export.php.rej
[ 44s] patching file lib/rrd.php
[ 44s] Reversed (or previously applied) patch detected! Assume -R? [n]
[ 44s] Apply anyway? [n]
[ 44s] Skipping patch.
[ 44s] 3 out of 3 hunks ignored -- saving rejects to file
lib/rrd.php.rej
[ 44s] error: Bad exit status from /var/tmp/rpm-tmp.P5jFSK (%prep)
[ 44s]
[ 44s]
[ 44s] RPM build errors:
[ 44s] Bad exit status from /var/tmp/rpm-tmp.P5jFSK (%prep)
[ 44s] ### WATCHDOG MARKER START ###
[ 47s] [ 32.810980] SysRq : Power Off
[ 47s] [ 32.813335] reboot: Power down
[ 59s] ### WATCHDOG MARKER END ###
--
To unsubscribe, e-mail: opensuse-packaging+***@opensuse.org
To contact the owner, e-mail: opensuse-packaging+***@opensuse.org
Vitezslav Cizek
2014-08-02 14:07:21 UTC
Permalink
Post by d***@velocitynet.com.au
%prep
%setup -q
%patch0 -p1
%patch1 -p1
#%patch2 -p1
%patch3 -p3
%patch4 -p1
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
#%patch3 -p3
%patch4 -p1
As Andrey already pointed out, the patch you are trying to add is
already in the package, added by ***@ajaissle.de in April.

$ md5sum security.patch cacti-0.8.8b_security.patch
bd18f265cca1f9713f88296f0be1ef56 security.patch
bd18f265cca1f9713f88296f0be1ef56 cacti-0.8.8b_security.patch

It's already fixed, don't patch it.
--
Vita Cizek
Continue reading on narkive:
Loading...