|
|
Author: varekova
Update of /cvs/dist/rpms/bzip2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5231
Modified Files:
.cvsignore bzip2.spec sources
Added Files:
bzip2-1.0.2-NULL-ptr-check.patch bzip2-1.0.3-saneso.patch
Removed Files:
bzip2-1.0.2-bomb.patch bzip2-1.0.2-saneso.patch
Log Message:
- new version 1.0.3
- add NULL-ptr-check patch (patch author: Mihai Limbasan <mihailim@xxxxxxxxx)
bzip2-1.0.2-NULL-ptr-check.patch:
bzlib.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE bzip2-1.0.2-NULL-ptr-check.patch ---
diff -Naur bzip2-1.0.2-orig/bzlib.c bzip2-1.0.2/bzlib.c
--- bzip2-1.0.2-orig/bzlib.c 2002-01-05 02:48:41.000000000 +0200
+++ bzip2-1.0.2/bzlib.c 2004-12-22 15:12:52.824593032 +0200
@@ -1536,9 +1536,12 @@
void BZ_API(BZ2_bzclose) (BZFILE* b)
{
int bzerr;
- FILE *fp = ((bzFile *)b)->handle;
-
+ FILE *fp;
+
if (b==NULL) {return;}
+
+ fp = ((bzFile *)b)->handle;
+
if(((bzFile*)b)->writing){
BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
if(bzerr != BZ_OK){
bzip2-1.0.3-saneso.patch:
Makefile-libbz2_so | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE bzip2-1.0.3-saneso.patch ---
--- bzip2-1.0.3/Makefile-libbz2_so.saneso 2004-10-17 19:32:13.000000000
+0200
+++ bzip2-1.0.3/Makefile-libbz2_so 2005-08-29 14:04:44.814183856 +0200
@@ -20,7 +20,7 @@
bzlib.o
all: $(OBJS)
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS)
+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.3 $(OBJS)
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
rm -f libbz2.so.1.0
ln -s libbz2.so.1.0.3 libbz2.so.1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 9 Sep 2004 03:40:02 -0000 1.3
+++ .cvsignore 29 Aug 2005 13:48:08 -0000 1.4
@@ -1 +1 @@
-bzip2-1.0.2.tar.gz
+bzip2-1.0.3.tar.gz
Index: bzip2.spec
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bzip2.spec 19 May 2005 12:51:19 -0000 1.13
+++ bzip2.spec 29 Aug 2005 13:48:08 -0000 1.14
@@ -1,15 +1,15 @@
Summary: A file compression utility.
Name: bzip2
-Version: 1.0.2
-Release: 16
+Version: 1.0.3
+Release: 1
License: BSD
Group: Applications/File
URL: http://sources.redhat.com/bzip2/
Source: ftp://sources.redhat.com/pub/bzip2/v102/bzip2-%{version}.tar.gz
-Patch0: bzip2-1.0.2-saneso.patch
+Patch0: bzip2-1.0.3-saneso.patch
Patch1: bzip2-1.0.2-tempfile.patch
Patch2: bzip2-1.0.2-chmod.patch
-Patch3: bzip2-1.0.2-bomb.patch
+Patch3: bzip2-1.0.2-NULL-ptr-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: bzip2-libs = %{version}
@@ -44,10 +44,10 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .saneso
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+%patch3 -p1 -b .nullptr
%build
@@ -65,7 +65,7 @@
mkdir -p $RPM_BUILD_ROOT/{%{_bindir},%{_mandir}/man1,%{_libdir},%{_includedir}}
install -m 755 bzlib.h $RPM_BUILD_ROOT/%{_includedir}
-install -m 755 libbz2.so.1.0.2 $RPM_BUILD_ROOT/%{_libdir}
+install -m 755 libbz2.so.1.0.3 $RPM_BUILD_ROOT/%{_libdir}
install -m 755 libbz2.a $RPM_BUILD_ROOT/%{_libdir}
install -m 755 bzip2-shared $RPM_BUILD_ROOT/%{_bindir}/bzip2
install -m 755 bzip2recover bzgrep bzdiff bzmore $RPM_BUILD_ROOT/%{_bindir}/
@@ -74,7 +74,7 @@
ln -s bzip2 $RPM_BUILD_ROOT/%{_bindir}/bzcat
ln -s bzdiff $RPM_BUILD_ROOT/%{_bindir}/bzcmp
ln -s bzmore $RPM_BUILD_ROOT/%{_bindir}/bzless
-ln -s libbz2.so.1.0.2 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so.1
+ln -s libbz2.so.1.0.3 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so.1
ln -s libbz2.so.1 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so
ln -s bzip2.1 $RPM_BUILD_ROOT/%{_mandir}/man1/bzip2recover.1
ln -s bzip2.1 $RPM_BUILD_ROOT/%{_mandir}/man1/bunzip2.1
@@ -107,6 +107,12 @@
%{_libdir}/*so
%changelog
+
+* Mon Aug 29 2005 Ivana Varekova <varekova@xxxxxxxxxx> 1.0.3-1
+- 1.0.3
+- add NULL-ptr-check patch
+ (patch author: Mihai Limbasan <mihailim@xxxxxxxxx)
+
* Thu May 19 2005 Jiri Ryska <jryska@xxxxxxxxxx>
- fixed permission setting for decompressed files #155742
- fixed decompression bomb (DoS) #157548
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Sep 2004 03:40:02 -0000 1.3
+++ sources 29 Aug 2005 13:48:08 -0000 1.4
@@ -1 +1 @@
-ee76864958d568677f03db8afad92beb bzip2-1.0.2.tar.gz
+8a716bebecb6e647d2e8a29ea5d8447f bzip2-1.0.3.tar.gz
--- bzip2-1.0.2-bomb.patch DELETED ---
--- bzip2-1.0.2-saneso.patch DELETED ---
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|