OBS User unknown 2006-12-18 23:18:46 +00:00 committed by Git OBS Bridge
commit 005d7dd2f7
12 changed files with 631 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

21
dietzlib.changes Normal file
View File

@ -0,0 +1,21 @@
-------------------------------------------------------------------
Wed Jan 25 21:31:09 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Wed Jul 27 11:40:59 CEST 2005 - ro@suse.de
- Upgraded to 1.2.3. Security fix is now in mainline.
-------------------------------------------------------------------
Wed Jul 6 17:56:41 CEST 2005 - meissner@suse.de
- added denial of service attack fix.
-------------------------------------------------------------------
Tue Jun 14 00:14:59 CEST 2005 - ro@suse.de
- cloned from zlib / built against dietlibc
- needed until dietlibc implements fortify extensions

79
dietzlib.spec Normal file
View File

@ -0,0 +1,79 @@
#
# spec file for package dietzlib (Version 1.2.3)
#
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org
#
# norootforbuild
Name: dietzlib
BuildRequires: dietlibc
License: Other License(s), see package
Group: System/Libraries
Autoreqprov: on
Version: 1.2.3
Release: 3
Summary: Data Compression Library
Source: zlib-%{version}.tar.bz2
Patch: zlib-1.2.1-make-test.patch
Patch1: zlib-1.2.1-vsnprintf.patch
Patch2: zlib-1.2.1-CFLAGS.dif
Patch3: zlib-1.2.2-format.patch
URL: http://www.zlib.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt
(deflate format) and rfc1952.txt (gzip format). These documents are
also available in other formats from
ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html.
Authors:
--------
Rob Hooft <hooft@EMBL-Heidelberg.DE>
Michael Mauldin <mlm@cs.cmu.edu>
%prep
%setup -n zlib-%version
%patch -p1
%patch1
%patch2
%patch3 -p1
%build
CC="diet -v gcc" \
LD="diet -v gcc" \
CFLAGS="$RPM_OPT_FLAGS" ./configure --static
make
make test
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/%_lib
# static lib
make libz.a
install -m 644 libz.a $RPM_BUILD_ROOT/usr/%{_lib}/libdiet_z.a
%clean
rm -rf %RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/%{_lib}/libdiet_z.a
%changelog -n dietzlib
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jul 27 2005 - ro@suse.de
- Upgraded to 1.2.3. Security fix is now in mainline.
* Wed Jul 06 2005 - meissner@suse.de
- added denial of service attack fix.
* Tue Jun 14 2005 - ro@suse.de
- cloned from zlib / built against dietlibc
- needed until dietlibc implements fortify extensions

0
ready Normal file
View File

11
zlib-1.2.1-CFLAGS.dif Normal file
View File

@ -0,0 +1,11 @@
--- configure
+++ configure 2003/11/21 14:06:46
@@ -69,7 +69,7 @@
if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
CC="$cc"
- SFLAGS=${CFLAGS-"-fPIC -O3"}
+ SFLAGS="-fPIC "${CFLAGS-"-O3"}
CFLAGS="$cflags"
case `(uname -s || echo unknown) 2>/dev/null` in
Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};;

View File

@ -0,0 +1,23 @@
--- zlib-1.1.4/Makefile.in.jj Mon Mar 11 08:58:30 2002
+++ zlib-1.1.4/Makefile.in Fri Apr 26 06:53:12 2002
@@ -62,13 +62,16 @@ all: example minigzip
test: all
@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
- echo hello world | ./minigzip | ./minigzip -d || \
- echo ' *** minigzip test FAILED ***' ; \
+ ret=0; \
+ if ! echo hello world | ./minigzip | ./minigzip -d; then \
+ echo ' *** minigzip test FAILED ***'; ret=1; \
+ fi; \
if ./example; then \
echo ' *** zlib test OK ***'; \
else \
- echo ' *** zlib test FAILED ***'; \
- fi
+ echo ' *** zlib test FAILED ***'; ret=1; \
+ fi; \
+ exit $$ret
libz.a: $(OBJS) $(OBJA)
$(AR) $@ $(OBJS) $(OBJA)

View File

@ -0,0 +1,42 @@
--- gzio.c
+++ gzio.c
@@ -606,16 +606,19 @@
va_start(va, format);
#ifdef NO_vsnprintf
# ifdef HAS_vsprintf_void
+#error
(void)vsprintf(buf, format, va);
va_end(va);
for (len = 0; len < sizeof(buf); len++)
if (buf[len] == 0) break;
# else
+#error
len = vsprintf(buf, format, va);
va_end(va);
# endif
#else
# ifdef HAS_vsnprintf_void
+#error
(void)vsnprintf(buf, sizeof(buf), format, va);
va_end(va);
len = strlen(buf);
@@ -643,16 +646,19 @@
buf[sizeof(buf) - 1] = 0;
#ifdef NO_snprintf
# ifdef HAS_sprintf_void
+#error
sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
for (len = 0; len < sizeof(buf); len++)
if (buf[len] == 0) break;
# else
+#error
len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
# endif
#else
# ifdef HAS_snprintf_void
+#error
snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
len = strlen(buf);

16
zlib-1.2.2-format.patch Normal file
View File

@ -0,0 +1,16 @@
--- zlib-1.2.2/zlib.h.xx 2005-02-23 12:52:02.889385975 +0100
+++ zlib-1.2.2/zlib.h 2005-02-23 12:55:14.227599948 +0100
@@ -986,7 +986,12 @@
(0 in case of error).
*/
-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+
+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...))
+#ifdef __GNUC__
+ __attribute__((__format__(__printf__,2,3)))
+#endif
+;
/*
Converts, formats, and writes the args to the compressed file under
control of the format string, as in fprintf. gzprintf returns the number of

3
zlib-1.2.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
size 425209

210
zlib.changes Normal file
View File

@ -0,0 +1,210 @@
-------------------------------------------------------------------
Wed Jan 25 21:31:09 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Sat Dec 17 09:02:34 CET 2005 - kukuk@suse.de
- Remove unpackaged libz.so symlink
-------------------------------------------------------------------
Wed Jul 20 10:52:46 CEST 2005 - meissner@suse.de
- Upgraded to 1.2.3. Security fix is now in mainline.
-------------------------------------------------------------------
Mon Jul 4 10:03:17 CEST 2005 - meissner@suse.de
- fixed memory corruption problem #94926, CAN-2005-2096.
-------------------------------------------------------------------
Fri Apr 1 09:34:23 CEST 2005 - kukuk@suse.de
- Remove movage of setting CFLAGS
-------------------------------------------------------------------
Tue Mar 29 10:44:32 CEST 2005 - kukuk@suse.de
- Update to 1.2.2.2
- Fix compiling with gcc 3.3 and 4.0
-------------------------------------------------------------------
Mon Feb 28 10:03:18 CET 2005 - meissner@suse.de
- Use __printf__ in format attribute to avoid printf defines.
-------------------------------------------------------------------
Wed Feb 23 13:11:56 CET 2005 - meissner@suse.de
- supply format arguments to gzprintf().
-------------------------------------------------------------------
Tue Feb 8 10:13:30 CET 2005 - ro@suse.de
- update to 1.2.2
-------------------------------------------------------------------
Wed Aug 25 14:39:49 CEST 2004 - ro@suse.de
- updated crash patch to version from Dmitry (#44087)
-------------------------------------------------------------------
Mon Aug 23 15:54:02 CEST 2004 - ro@suse.de
- added fix for crash on invalid input (#44087)
-------------------------------------------------------------------
Thu Dec 4 01:59:05 CET 2003 - ro@suse.de
- update to 1.2.1
-------------------------------------------------------------------
Fri Nov 21 15:08:36 CET 2003 - kukuk@suse.de
- Use RPM_OPT_FLAGS
- Compile with no execstack
-------------------------------------------------------------------
Mon Oct 20 18:27:53 CEST 2003 - ro@suse.de
- don't build as root
-------------------------------------------------------------------
Mon May 12 18:55:18 CEST 2003 - kukuk@suse.de
- Add defattr
-------------------------------------------------------------------
Mon Mar 3 16:52:51 CET 2003 - ro@suse.de
- do use vsnprintf
-------------------------------------------------------------------
Sun Feb 16 10:37:37 CET 2003 - olh@suse.de
- no absolute symlinks for libz.so
-------------------------------------------------------------------
Thu Jul 25 08:40:28 CEST 2002 - kukuk@suse.de
- Rename to zlib
- Splitt off zlib-devel
-------------------------------------------------------------------
Fri Jul 5 12:50:05 MEST 2002 - bk@suse.de
- enable make test
-------------------------------------------------------------------
Mon May 27 09:13:31 CEST 2002 - ro@suse.de
- update to 1.1.4 including the previous security patch
- Returned incorrect error (Z_MEM_ERROR) on some invalid data
- Avoid accesses before window for invalid distances with inflate window
less than 32K.
- force windowBits > 8 to avoid a bug in the encoder for a window size
of 256 bytes. (A complete fix will be available in 1.1.5).
-------------------------------------------------------------------
Mon Feb 25 14:37:54 CET 2002 - ro@suse.de
- remove executable bits from manpage and include file
-------------------------------------------------------------------
Thu Feb 7 11:55:43 MET 2002 - draht@suse.de
- prevent double free() (security problem) with
zlib-1.1.3-zfree.dif
-------------------------------------------------------------------
Tue Dec 11 15:40:35 CET 2001 - froh@suse.de
- fixed specfile to use %_libdir for make install for
the sake of lib64 on S/390. also updated old sparc64 %ifarch at
this point.
-------------------------------------------------------------------
Tue Dec 4 17:54:00 CET 2001 - ro@suse.de
- added Provides zlib-devel for compatibility
-------------------------------------------------------------------
Tue May 1 18:12:26 CEST 2001 - kukuk@suse.de
- Minor spec file fixes for sparc64
-------------------------------------------------------------------
Thu Dec 7 13:55:36 CET 2000 - kukuk@suse.de
- Install only shared library in /%{_lib}
-------------------------------------------------------------------
Wed Dec 6 16:20:09 CET 2000 - ro@suse.de
- install main lib in /%{_lib} not /usr/%{_lib}
-------------------------------------------------------------------
Mon Oct 2 20:25:01 CEST 2000 - kukuk@suse.de
- Use %{_lib} macro
-------------------------------------------------------------------
Mon Sep 25 15:27:33 CEST 2000 - ro@suse.de
- sorted
-------------------------------------------------------------------
Wed Apr 5 01:01:37 CEST 2000 - bk@suse.de
- fixed BuildRoot support
-------------------------------------------------------------------
Mon Apr 3 15:12:01 MEST 2000 - bk@suse.de
- added buildroot for build with dynamically linked rpm which uses libz(s390)
-------------------------------------------------------------------
Thu Jan 20 15:38:46 CET 2000 - aj@suse.de
- /usr/man -> /usr/share/man
-------------------------------------------------------------------
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
-------------------------------------------------------------------
Tue Jul 13 13:13:43 MEST 1999 - ro@suse.de
- added zutil.h
-------------------------------------------------------------------
Thu Mar 4 10:03:38 MET 1999 - ro@suse.de
- moved from /usr/X11R6 to usr
- libgz is now only a link to libz
- "libgz.so.1" is provided from specfile
-------------------------------------------------------------------
Tue Aug 25 17:11:04 MEST 1998 - ro@suse.de
- update to 1.1.3
-------------------------------------------------------------------
Fri Mar 20 13:58:12 MET 1998 - ro@suse.de
- update to 1.1.2
-------------------------------------------------------------------
Mon Mar 2 14:03:08 MET 1998 - ro@suse.de
- update to 1.1.1
-------------------------------------------------------------------
Fri Feb 27 11:17:44 MET 1998 - ro@suse.de
- update to version 1.0.9
created own specfile for easier maintenance
included man-pages

202
zlib.spec Normal file
View File

@ -0,0 +1,202 @@
#
# spec file for package zlib (Version 1.2.3)
#
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org
#
# norootforbuild
Name: zlib
License: Other License(s), see package
Group: System/Libraries
Provides: libgz.so.1 libz
Obsoletes: libz
Autoreqprov: on
Version: 1.2.3
Release: 4
Summary: Data Compression Library
Source: zlib-%{version}.tar.bz2
Patch: zlib-1.2.1-make-test.patch
Patch1: zlib-1.2.1-vsnprintf.patch
Patch2: zlib-1.2.1-CFLAGS.dif
Patch3: zlib-1.2.2-format.patch
URL: http://www.zlib.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt
(deflate format) and rfc1952.txt (gzip format). These documents are
also available in other formats from
ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html.
Authors:
--------
Rob Hooft <hooft@EMBL-Heidelberg.DE>
Michael Mauldin <mlm@cs.cmu.edu>
%package devel
Summary: Include Files and Libraries mandatory for Development.
Group: Development/Languages/C and C++
Provides: libz:/usr/include/zlib.h
Requires: zlib = %{version}
Autoreqprov: on
%description devel
This package contains all necessary include files and libraries needed
to develop applications that require the provided includes and
libraries.
%prep
%setup -q
%patch -p1
%patch1
%patch2
%patch3 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --shared
make
make test
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/{%_lib,/usr/%_lib}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3
mkdir -p $RPM_BUILD_ROOT/usr/include
make install \
prefix=$RPM_BUILD_ROOT/%{_prefix} \
libdir=$RPM_BUILD_ROOT/%{_lib}
ln -sf ../../%{_lib}/libz.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libz.so
rm $RPM_BUILD_ROOT/%{_lib}/libz.so
# static lib
make libz.a
install -m 644 libz.a $RPM_BUILD_ROOT/usr/%{_lib}
# manpage
install -m 644 zlib.3 $RPM_BUILD_ROOT/%{_mandir}/man3
install -m 644 zutil.h $RPM_BUILD_ROOT/usr/include
# libgz alias (hopefully unused by now)
ln -sf libz.a $RPM_BUILD_ROOT/usr/%{_lib}/libgz.a
ln -sf ../../%{_lib}/libz.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libgz.so.1
%clean
rm -rf %RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc README ChangeLog algorithm.txt
/usr/%{_lib}/libgz.so.1
/%{_lib}/libz.so.1.2.*
/%{_lib}/libz.so.1
%files devel
%defattr(-,root,root)
%doc %{_mandir}/man3/zlib.3.gz
/usr/%{_lib}/libgz.a
/usr/include/zlib.h
/usr/include/zconf.h
/usr/include/zutil.h
/usr/%{_lib}/libz.so
/usr/%{_lib}/libz.a
%changelog -n zlib
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Sat Dec 17 2005 - kukuk@suse.de
- Remove unpackaged libz.so symlink
* Wed Jul 20 2005 - meissner@suse.de
- Upgraded to 1.2.3. Security fix is now in mainline.
* Mon Jul 04 2005 - meissner@suse.de
- fixed memory corruption problem #94926, CAN-2005-2096.
* Fri Apr 01 2005 - kukuk@suse.de
- Remove movage of setting CFLAGS
* Tue Mar 29 2005 - kukuk@suse.de
- Update to 1.2.2.2
- Fix compiling with gcc 3.3 and 4.0
* Mon Feb 28 2005 - meissner@suse.de
- Use __printf__ in format attribute to avoid printf defines.
* Wed Feb 23 2005 - meissner@suse.de
- supply format arguments to gzprintf().
* Tue Feb 08 2005 - ro@suse.de
- update to 1.2.2
* Wed Aug 25 2004 - ro@suse.de
- updated crash patch to version from Dmitry (#44087)
* Mon Aug 23 2004 - ro@suse.de
- added fix for crash on invalid input (#44087)
* Thu Dec 04 2003 - ro@suse.de
- update to 1.2.1
* Fri Nov 21 2003 - kukuk@suse.de
- Use RPM_OPT_FLAGS
- Compile with no execstack
* Mon Oct 20 2003 - ro@suse.de
- don't build as root
* Mon May 12 2003 - kukuk@suse.de
- Add defattr
* Mon Mar 03 2003 - ro@suse.de
- do use vsnprintf
* Sun Feb 16 2003 - olh@suse.de
- no absolute symlinks for libz.so
* Thu Jul 25 2002 - kukuk@suse.de
- Rename to zlib
- Splitt off zlib-devel
* Fri Jul 05 2002 - bk@suse.de
- enable make test
* Mon May 27 2002 - ro@suse.de
- update to 1.1.4 including the previous security patch
- Returned incorrect error (Z_MEM_ERROR) on some invalid data
- Avoid accesses before window for invalid distances with inflate window
less than 32K.
- force windowBits > 8 to avoid a bug in the encoder for a window size
of 256 bytes. (A complete fix will be available in 1.1.5).
* Mon Feb 25 2002 - ro@suse.de
- remove executable bits from manpage and include file
* Thu Feb 07 2002 - draht@suse.de
- prevent double free() (security problem) with
zlib-1.1.3-zfree.dif
* Tue Dec 11 2001 - froh@suse.de
- fixed specfile to use %%_libdir for make install for
the sake of lib64 on S/390. also updated old sparc64 %%ifarch at
this point.
* Tue Dec 04 2001 - ro@suse.de
- added Provides zlib-devel for compatibility
* Tue May 01 2001 - kukuk@suse.de
- Minor spec file fixes for sparc64
* Thu Dec 07 2000 - kukuk@suse.de
- Install only shared library in /%%{_lib}
* Wed Dec 06 2000 - ro@suse.de
- install main lib in /%%{_lib} not /usr/%%{_lib}
* Mon Oct 02 2000 - kukuk@suse.de
- Use %%{_lib} macro
* Mon Sep 25 2000 - ro@suse.de
- sorted
* Wed Apr 05 2000 - bk@suse.de
- fixed BuildRoot support
* Mon Apr 03 2000 - bk@suse.de
- added buildroot for build with dynamically linked rpm which uses libz(s390)
* Thu Jan 20 2000 - aj@suse.de
- /usr/man -> /usr/share/man
* Mon Sep 13 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Tue Jul 13 1999 - ro@suse.de
- added zutil.h
* Thu Mar 04 1999 - ro@suse.de
- moved from /usr/X11R6 to usr
- libgz is now only a link to libz
- "libgz.so.1" is provided from specfile
* Tue Aug 25 1998 - ro@suse.de
- update to 1.1.3
* Fri Mar 20 1998 - ro@suse.de
- update to 1.1.2
* Mon Mar 02 1998 - ro@suse.de
- update to 1.1.1
* Fri Feb 27 1998 - ro@suse.de
- update to version 1.0.9
created own specfile for easier maintenance
included man-pages