Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 17 years ago
parent
commit
28695fde3e
8 changed files with 7 additions and 163 deletions
  1. +0
    -43
      package/base/e2fsprogs/makefile-libe2p-fix.patch
  2. +0
    -35
      package/base/flex/gen.c-fix.patch
  3. +0
    -35
      package/base/flex/harmfull_undefs.patch
  4. +0
    -43
      package/base/flex/head-tail.patch
  5. +2
    -2
      package/base/gettext/gettext.desc
  6. +2
    -2
      package/base/gzip/gzip.desc
  7. +1
    -1
      package/base/postfix/postfix.conf
  8. +2
    -2
      package/base/tar/tar.desc

+ 0
- 43
package/base/e2fsprogs/makefile-libe2p-fix.patch

@ -1,43 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/e2fsprogs/makefile-libe2p-fix.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -dur e2fsprogs-1.38/e2fsck/Makefile.in e2fsprogs-1.38-p/e2fsck/Makefile.in
--- e2fsprogs-1.38/e2fsck/Makefile.in 2005-06-29 19:42:20.000000000 +0200
+++ e2fsprogs-1.38-p/e2fsck/Makefile.in 2005-10-18 20:48:27.000000000 +0200
@@ -16,7 +16,7 @@
MANPAGES= e2fsck.8
XTRA_CFLAGS= -DRESOURCE_TRACK
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
+LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
diff -dur e2fsprogs-1.38/tests/progs/Makefile.in e2fsprogs-1.38-p/tests/progs/Makefile.in
--- e2fsprogs-1.38/tests/progs/Makefile.in 2005-06-29 19:42:20.000000000 +0200
+++ e2fsprogs-1.38-p/tests/progs/Makefile.in 2005-10-18 20:48:27.000000000 +0200
@@ -21,7 +21,7 @@
SRCS= $(srcdir)/test_rel.c
-LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
+LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
.c.o:

+ 0
- 35
package/base/flex/gen.c-fix.patch

@ -1,35 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/flex/gen.c-fix.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- flex-2.5.31/gen.c 2003-03-30 21:58:44.000000000 +0200
+++ flex-2.5.31/gen.c.old 2003-12-28 00:05:52.000000000 +0100
@@ -1810,11 +1810,8 @@
if (yymore_used) {
if (!C_plus_plus) {
if (yytext_is_array) {
- if (!reentrant){
- indent_puts ("static int yy_more_offset = 0;");
- }else{
- indent_puts ("static int yy_prev_more_offset = 0;");
- }
+ indent_puts ("static int yy_more_offset = 0;");
+ indent_puts ("static int yy_prev_more_offset = 0;");
}
else if (!reentrant) {
indent_puts

+ 0
- 35
package/base/flex/harmfull_undefs.patch

@ -1,35 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/flex/harmfull_undefs.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Remove this harmfull undefs introduced in flex-2.5.31
Alejandro
--- ./flex.skl.orig 2004-05-11 11:15:03.000000000 -0400
+++ ./flex.skl 2004-05-11 11:15:23.000000000 -0400
@@ -3277,10 +3277,8 @@
%ok-for-header
#undef YY_NEW_FILE
#undef YY_FLUSH_BUFFER
-#undef yy_set_bol
#undef yy_new_buffer
#undef yy_set_interactive
-#undef yytext_ptr
#undef YY_DO_BEFORE_ACTION
#ifdef YY_DECL_IS_OURS

+ 0
- 43
package/base/flex/head-tail.patch

@ -1,43 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/flex/head-tail.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -dur flex-2.5.31/configure flex-2.5.31-p/configure
--- flex-2.5.31/configure 2003-04-01 18:32:25.000000000 +0200
+++ flex-2.5.31-p/configure 2004-11-04 18:57:48.007085480 +0100
@@ -5825,7 +5825,7 @@
if test "$INDENT" != indent ; then
echo "$as_me:$LINENO: checking if $INDENT is GNU indent" >&5
echo $ECHO_N "checking if $INDENT is GNU indent... $ECHO_C" >&6
- if $INDENT --version 2>/dev/null | head -1|grep "GNU indent" > /dev/null ; then
+ if $INDENT --version 2>/dev/null | head -n1|grep "GNU indent" > /dev/null ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
diff -dur flex-2.5.31/configure.in flex-2.5.31-p/configure.in
--- flex-2.5.31/configure.in 2003-04-01 18:17:51.000000000 +0200
+++ flex-2.5.31-p/configure.in 2004-11-04 18:57:39.858324280 +0100
@@ -48,7 +48,7 @@
dnl if INDENT is set to 'indent' then we didn't find indent
if test "$INDENT" != indent ; then
AC_MSG_CHECKING(if $INDENT is GNU indent)
- if $INDENT --version 2>/dev/null | head -1|grep "GNU indent" > /dev/null ; then
+ if $INDENT --version 2>/dev/null | head -n1|grep "GNU indent" > /dev/null ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)

+ 2
- 2
package/base/gettext/gettext.desc

@ -41,8 +41,8 @@
[L] LGPL
[S] Stable
[V] 0.16.1
[V] 0.14.6
[P] X -1-3-----9 104.400
[D] 1164334990 gettext-0.16.1.tar.gz ftp://ftp.gnu.org/pub/gnu/gettext/
[D] 322001980 gettext-0.14.6.tar.gz ftp://ftp.gnu.org/pub/gnu/gettext/

+ 2
- 2
package/base/gzip/gzip.desc

@ -40,9 +40,9 @@
[F] CORE
[L] GPL
[S] Alpha
[S] Stable
[V] 1.3.12
[P] X X1---5---9 100.900
[D] 1860569078 gzip-1.3.12.tar.gz ftp://alpha.gnu.org/gnu/gzip/
[D] 1860569078 gzip-1.3.12.tar.gz ftp://ftp.gnu.org/gnu/gzip/

+ 1
- 1
package/base/postfix/postfix.conf

@ -44,7 +44,7 @@ pkg_postfix_postmake() {
install_root=$root \
manpage_directory=$mandir \
sample_directory=$docdir \
readme_directory=$docdir
readme_directory=$docdir || true
install_setmailer postfix
install_init $pkg $confdir/$pkg.init
}

+ 2
- 2
package/base/tar/tar.desc

@ -38,8 +38,8 @@
[L] GPL
[S] Stable
[V] 1.18
[V] 1.16.1
[P] X X1---5---9 107.100
[D] 2358965171 tar-1.18.tar.bz2 ftp://ftp.gnu.org/gnu/tar/
[D] 0 tar-1.16.1.tar.bz2 ftp://ftp.gnu.org/gnu/tar/

Loading…
Cancel
Save