diff options
author | taca <taca@pkgsrc.org> | 2001-12-30 16:49:40 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2001-12-30 16:49:40 +0000 |
commit | 8fc9cf74249a8e2767d261a6ec8b4797347b51be (patch) | |
tree | eeba1c800ffc46568056b55198dcad1679c95a6a /archivers/ruby-zlib | |
parent | 4976a3e755cc4a7f75e410f4e8dbbdd2a96bbecc (diff) | |
download | pkgsrc-8fc9cf74249a8e2767d261a6ec8b4797347b51be.tar.gz |
Add patch for preventing core dump and bump package to nb1.
Diffstat (limited to 'archivers/ruby-zlib')
-rw-r--r-- | archivers/ruby-zlib/Makefile | 13 | ||||
-rw-r--r-- | archivers/ruby-zlib/PLIST | 5 | ||||
-rw-r--r-- | archivers/ruby-zlib/distinfo | 3 | ||||
-rw-r--r-- | archivers/ruby-zlib/patches/patch-aa | 16 |
4 files changed, 25 insertions, 12 deletions
diff --git a/archivers/ruby-zlib/Makefile b/archivers/ruby-zlib/Makefile index 3370ced5085..d6b72a95745 100644 --- a/archivers/ruby-zlib/Makefile +++ b/archivers/ruby-zlib/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/06/30 23:13:25 taca Exp $ +# $NetBSD: Makefile,v 1.2 2001/12/30 16:49:40 taca Exp $ # FreeBSD: ports/archivers/ruby-zlib/Makefile,v 1.7 2000/09/26 22:01:12 knu Exp DISTNAME= ruby-zlib-${VERSION} PKGNAME= ${RUBY_PKGNAMEPREFIX}zlib-${VERSION} +PKGREVISION= 1 CATEGORIES= archivers MASTER_SITES= http://www.blue.sky.or.jp/atelier/ruby/ @@ -15,17 +16,13 @@ DIST_SUBDIR= ruby USE_RUBY_EXTCONF= yes INSTALL_TARGET= site-install -DOCS_EN= ChangeLog zlib.en.html -DOCS_JA= zlib.ja.html +DOCS= ChangeLog zlib.en.html zlib.ja.html post-install: - ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/zlib/ja -.for f in ${DOCS_EN} + ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/zlib +.for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/zlib .endfor -.for f in ${DOCS_JA} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/zlib/ja -.endfor .include "../../lang/ruby-base/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/ruby-zlib/PLIST b/archivers/ruby-zlib/PLIST index 283765c2849..4eac419c03d 100644 --- a/archivers/ruby-zlib/PLIST +++ b/archivers/ruby-zlib/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:41 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/12/30 16:49:40 taca Exp $ ${RUBY_SITEARCHLIBDIR}/zlib.so ${RUBY_DOCDIR}/zlib/ChangeLog ${RUBY_DOCDIR}/zlib/zlib.en.html -${RUBY_DOCDIR}/zlib/ja/zlib.ja.html -@dirrm ${RUBY_DOCDIR}/zlib/ja +${RUBY_DOCDIR}/zlib/zlib.ja.html @dirrm ${RUBY_DOCDIR}/zlib diff --git a/archivers/ruby-zlib/distinfo b/archivers/ruby-zlib/distinfo index 32f05e6ca3c..7d957bd0600 100644 --- a/archivers/ruby-zlib/distinfo +++ b/archivers/ruby-zlib/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/30 23:13:25 taca Exp $ +$NetBSD: distinfo,v 1.2 2001/12/30 16:49:40 taca Exp $ SHA1 (ruby/ruby-zlib-0.4.0.tar.gz) = 14f17f97d5a8714f1d1d9aa8c0687f2c27225356 Size (ruby/ruby-zlib-0.4.0.tar.gz) = 21228 bytes +SHA1 (patch-aa) = 5be2e3e5894624e2c7f6a20501a0d199cee90bc1 diff --git a/archivers/ruby-zlib/patches/patch-aa b/archivers/ruby-zlib/patches/patch-aa new file mode 100644 index 00000000000..f973633d34d --- /dev/null +++ b/archivers/ruby-zlib/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.1 2001/12/30 16:49:41 taca Exp $ + +--- zlib.c.orig Tue Sep 26 14:47:02 2000 ++++ zlib.c +@@ -274,8 +274,9 @@ + memmove(RSTRING(z->buf)->ptr, RSTRING(z->buf)->ptr + len, + z->buf_filled); + z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled; +- z->stream.avail_out = (z->buf_filled < ZSTREAM_AVAIL_OUT_STEP) ? +- z->buf_filled : ZSTREAM_AVAIL_OUT_STEP; ++ z->stream.avail_out = RSTRING(z->buf)->len - z->buf_filled; ++ if (z->stream.avail_out > ZSTREAM_AVAIL_OUT_STEP) ++ z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP; + + return dst; + } |