diff --git a/package/stefanp/ncp/errno.patch b/package/stefanp/ncp/errno.patch index c30c5e90a..26735897a 100644 --- a/package/stefanp/ncp/errno.patch +++ b/package/stefanp/ncp/errno.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/stefanp/ncp/errno.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# 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 --git a/package/stefanp/ncp/head-tail.patch b/package/stefanp/ncp/head-tail.patch new file mode 100644 index 000000000..ea5a68c3e --- /dev/null +++ b/package/stefanp/ncp/head-tail.patch @@ -0,0 +1,75 @@ +# --- 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/stefanp/ncp/head-tail.patch +# ROCK Linux is Copyright (C) 1998 - 2004 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 --- + + +The usual deprecated options ... + + - Rene Rebe + +--- ./Makefile.vanilla 2004-05-17 00:09:17.661888280 +0200 ++++ ./Makefile 2004-05-17 00:11:00.021327280 +0200 +@@ -99,14 +99,14 @@ + compile: \ + warn-auto.sh conf-cc + ( cat warn-auto.sh; \ +- echo exec "`head -1 conf-cc`" '-c $${1+"$$@"}' \ ++ echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \ + ) > compile + chmod 755 compile + + preprocess: \ + warn-auto.sh conf-cc + ( cat warn-auto.sh; \ +- echo exec "`head -1 conf-cc`" '-E $${1+"$$@"}' \ ++ echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \ + ) > preprocess + chmod 755 preprocess + +@@ -114,7 +114,7 @@ + warn-auto.sh conf-ld + ( cat warn-auto.sh; \ + echo 'main="$$1"; shift'; \ +- echo exec "`head -1 conf-ld`" \ ++ echo exec "`head -n 1 conf-ld`" \ + '-o "$$main" "$$main".o $${1+"$$@"}' \ + ) > load + chmod 755 load +@@ -131,11 +131,11 @@ + + uint32.h: \ + preprocess tryulong.c uint32.h1 uint32.h2 +- if test `./preprocess tryulong.c | tail -1` = 32; then cat uint32.h2; else cat uint32.h1; fi > uint32.h ++ if test `./preprocess tryulong.c | tail -n 1` = 32; then cat uint32.h2; else cat uint32.h1; fi > uint32.h + + uint64.h: \ + preprocess tryulong.c uint64.h1 uint64.h2 +- if test `./preprocess tryulong.c | tail -1` = 64; then cat uint64.h2; else cat uint64.h1; fi > uint64.h ++ if test `./preprocess tryulong.c | tail -n 1` = 64; then cat uint64.h2; else cat uint64.h1; fi > uint64.h + + haveip6.h: \ + tryip6.c choose compile haveip6.h1 haveip6.h2 +@@ -182,7 +182,7 @@ + + auto_home.c: \ + auto-str conf-home +- ./auto-str auto_home `head -1 conf-home` > auto_home.c ++ ./auto-str auto_home `head -n 1 conf-home` > auto_home.c + + # automatically generated dependancies follow + alloc.o: \ diff --git a/package/stefanp/ncp/ncp.conf b/package/stefanp/ncp/ncp.conf index 5d475377e..3db1b47e4 100644 --- a/package/stefanp/ncp/ncp.conf +++ b/package/stefanp/ncp/ncp.conf @@ -7,7 +7,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/stefanp/ncp/ncp.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/stefanp/ncp/ncp.desc b/package/stefanp/ncp/ncp.desc index 80fd0c4aa..35c2343ee 100644 --- a/package/stefanp/ncp/ncp.desc +++ b/package/stefanp/ncp/ncp.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/stefanp/ncp/ncp.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by