From: Jan RÄ™korajski Date: Fri, 21 Apr 2006 23:40:33 +0000 (+0000) Subject: - orphaned, outdated X-Git-Tag: auto/th/epic4-2_2-2~5 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fepic4.git;a=commitdiff_plain;h=574988572c8114adc574c56e87f6df2dfa320fa4 - orphaned, outdated Changed files: epic-DESTDIR.patch -> 1.3 epic4-0.9.11-patch1 -> 1.2 epic4-0.9.11-patch2 -> 1.2 epic4-0.9.13-patch1 -> 1.2 epic4-1.1.6.DESTDIR.patch -> 1.2 epic4-ac.patch -> 1.2 epic4-missing-terminating-char.patch -> 1.2 epic4-paste.patch -> 1.2 epic4-security-CAN-2003-0328.patch -> 1.2 epic4pre2.508-make.patch -> 1.2 --- diff --git a/epic-DESTDIR.patch b/epic-DESTDIR.patch deleted file mode 100644 index 2bf980a..0000000 --- a/epic-DESTDIR.patch +++ /dev/null @@ -1,434 +0,0 @@ -diff -urN epic4-0.9.15.org/Makefile.in epic4-0.9.15/Makefile.in ---- epic4-0.9.15.org/Makefile.in Sun Jan 7 11:39:32 2001 -+++ epic4-0.9.15/Makefile.in Sun Jan 7 11:40:30 2001 -@@ -72,9 +72,9 @@ - mandir = @mandir@ - - epic = @epic@ --epic_exe = $(bindir)/$(epic) --wserv_exe = $(libexecdir)/wserv --epicdir = $(sharedir)/$(epic) -+epic_exe = $(epic) -+wserv_exe = wserv -+epicdir = $(epic) - - ############ You ought not change anything below this line ################### - -@@ -111,22 +111,11 @@ - epic: source/Makefile Makefile - @cd source; $(MAKE2) all - --EPIC = $(epic_exe)-$(VERSION) -+EPIC = $(epic_exe) - EPIC_OLD = $(epic_exe).old - EPIC_LINK = $(epic_exe) - installepic installirc: epic installdirs test -- if ./my_test \( ! -f $(IP)$(EPIC) \) \ -- -o source/epic -nt $(IP)$(EPIC); then \ -- $(INSTALL_PROGRAM) source/epic $(IP)$(EPIC); \ -- if ./my_test -f $(IP)$(EPIC_OLD); then \ -- $(RM) $(IP)$(EPIC_OLD); \ -- fi; \ -- if ./my_test -f $(IP)$(EPIC_LINK); then \ -- $(MV) $(IP)$(EPIC_LINK) $(IP)$(EPIC_OLD); \ -- fi; \ -- $(RM) $(IP)$(EPIC_LINK); \ -- ln -s $(IP)$(EPIC) $(IP)$(EPIC_LINK); \ -- fi -+ $(INSTALL_PROGRAM) source/epic $(DESTDIR)$(bindir) - - # - # wserv -@@ -136,11 +125,8 @@ - - WSERV = $(wserv_exe) - installwserv: wserv installdirs test -- if ./my_test \( \! -f $(IP)$(WSERV) \) -o \ -- source/wserv -nt $(IP)$(WSERV); then \ -- $(INSTALL_PROGRAM) source/wserv $(IP)$(WSERV); \ -- fi -- -+ @srcdir@/mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) source/wserv $(DESTDIR)$(bindir) - - # - # Script library -@@ -148,7 +134,7 @@ - scriptdir = $(epicdir)/script - installscript: installdirs test - -@( \ -- if ./my_test -f $(IP)$(scriptdir)/local; then \ -+ if ./my_test -f $(DESTDIR)$(scriptdir)/local; then \ - if ./my_test -f script/local; then \ - $(MV) @srcdir@/script/local \ - @srcdir@/script/local.orig; \ -@@ -157,7 +143,7 @@ - ) - for i in @srcdir@/script/*; \ - do \ -- target=$(IP)$(scriptdir)/`basename $$i`; \ -+ target=$(DESTDIR)$(scriptdir)/`basename $$i`; \ - if ./my_test -f $$target; then \ - if ./my_test $$i -nt $$target; then \ - $(INSTALL_DATA) $$i $$target; \ -@@ -172,7 +158,7 @@ - elif ./my_test -f $$i; then \ - $(INSTALL_DATA) $$i $$target; \ - chmod -x $$target; \ -- if ./my_test -f $(IP)$(scriptdir)/gzip-scripts; then \ -+ if ./my_test -f $(DESTDIR)$(scriptdir)/gzip-scripts; then \ - gzip -f $$target; \ - fi; \ - fi; \ -@@ -180,16 +166,16 @@ - - helpdir = $(epicdir)/help - installhelp: installdirs -- (cd @srcdir@/help; tar cf - .) | (cd $(IP)$(helpdir); tar xf -) -+ (cd @srcdir@/help; tar cf - .) | (cd $(DESTDIR)$(helpdir); tar xf -) - - installman: installdirs -- $(INSTALL_DATA) @srcdir@/doc/epic.1 $(IP)/$(mandir)/man1/$(epic).1 -+ $(INSTALL_DATA) @srcdir@/doc/epic.1 $(DESTDIR)$(mandir)/man1/$(epic).1 - - installdirs: - umask 022; \ -- @srcdir@/mkinstalldirs $(IP)$(epicdir) $(IP)$(scriptdir) \ -- $(IP)$(helpdir) $(IP)$(bindir) $(IP)$(libexecdir) \ -- $(IP)$(mandir)/man1 -+ @srcdir@/mkinstalldirs $(DESTDIR)$(epicdir) $(DESTDIR)$(scriptdir) \ -+ $(DESTDIR)$(helpdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) \ -+ $(DESTDIR)$(mandir)/man1 - - test.o: @srcdir@/test.c - $(CC) -c @srcdir@/test.c -diff -urN epic4-0.9.15.org/bsdinstall epic4-0.9.15/bsdinstall ---- epic4-0.9.15.org/bsdinstall Sun Jan 7 11:39:32 2001 -+++ epic4-0.9.15/bsdinstall Sun Jan 7 11:39:41 2001 -@@ -1,90 +1,251 @@ --#! /bin/sh -+#!/bin/sh - # --# @(#)install.sh 4.5 (Berkeley) 10/12/83 -+# install - install a program, script, or datafile -+# This comes from X11R5 (mit/util/scripts/install.sh). - # --cmd=/bin/mv --strip="" --chmod="/bin/chmod 755" --chown="" --chgrp="" --while true ; do -- case $1 in -- -s ) strip="/bin/strip" -- shift -- ;; -- -c ) cmd="/bin/cp -p" -- shift -- ;; -- -m ) chmod="/bin/chmod $2" -- shift -- shift -- ;; -- -o ) chown="/etc/chown -f $2" -- shift -- shift -- ;; -- -g ) chgrp="/bin/chgrp -f $2" -- shift -- shift -- ;; -- -d ) cmd="/bin/mkdir" -- shift -- ;; -- * ) break -- ;; -- esac -+# Copyright 1991 by the Massachusetts Institute of Technology -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of M.I.T. not be used in advertising or -+# publicity pertaining to distribution of the software without specific, -+# written prior permission. M.I.T. makes no representations about the -+# suitability of this software for any purpose. It is provided "as is" -+# without express or implied warranty. -+# -+# Calling this script install-sh is preferred over install.sh, to prevent -+# `make' implicit rules from creating a file called install from it -+# when there is no Makefile. -+# -+# This script is compatible with the BSD install script, but was written -+# from scratch. It can only install one file at a time, a restriction -+# shared with many OS's install programs. -+ -+ -+# set DOITPROG to echo to test this script -+ -+# Don't use :- since 4.3BSD and earlier shells don't like it. -+doit="${DOITPROG-}" -+ -+ -+# put in absolute paths if you don't have them in your path; or use env. vars. -+ -+mvprog="${MVPROG-mv}" -+cpprog="${CPPROG-cp}" -+chmodprog="${CHMODPROG-chmod}" -+chownprog="${CHOWNPROG-chown}" -+chgrpprog="${CHGRPPROG-chgrp}" -+stripprog="${STRIPPROG-strip}" -+rmprog="${RMPROG-rm}" -+mkdirprog="${MKDIRPROG-mkdir}" -+ -+transformbasename="" -+transform_arg="" -+instcmd="$mvprog" -+chmodcmd="$chmodprog 0755" -+chowncmd="" -+chgrpcmd="" -+stripcmd="" -+rmcmd="$rmprog -f" -+mvcmd="$mvprog" -+src="" -+dst="" -+dir_arg="" -+ -+while [ x"$1" != x ]; do -+ case $1 in -+ -c) instcmd="$cpprog" -+ shift -+ continue;; -+ -+ -d) dir_arg=true -+ shift -+ continue;; -+ -+ -m) chmodcmd="$chmodprog $2" -+ shift -+ shift -+ continue;; -+ -+ -o) chowncmd="$chownprog $2" -+ shift -+ shift -+ continue;; -+ -+ -g) chgrpcmd="$chgrpprog $2" -+ shift -+ shift -+ continue;; -+ -+ -s) stripcmd="$stripprog" -+ shift -+ continue;; -+ -+ -t=*) transformarg=`echo $1 | sed 's/-t=//'` -+ shift -+ continue;; -+ -+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'` -+ shift -+ continue;; -+ -+ *) if [ x"$src" = x ] -+ then -+ src=$1 -+ else -+ # this colon is to work around a 386BSD /bin/sh bug -+ : -+ dst=$1 -+ fi -+ shift -+ continue;; -+ esac - done - --if test ! ${2-""}; then -- echo "install: no destination specified" -+if [ x"$src" = x ] -+then -+ echo "install: no input file specified" - exit 1 -+else -+ true - fi --if test ${3-""}; then -- echo "install: too many files specified -> $*" -- exit 1 --fi --if test $1 = $2 -o $2 = .; then -- echo "install: can't move $1 onto itself" -- exit 1 --fi --case $cmd in --/bin/mkdir ) -- file=$2/$1 -- ;; --* ) -- if test '!' -f $1; then -- echo "install: can't open $1" -- exit 1 -+ -+if [ x"$dir_arg" != x ]; then -+ dst=$src -+ src="" -+ -+ if [ -d $dst ]; then -+ instcmd=: -+ chmodcmd="" -+ else -+ instcmd=mkdir - fi -- if test -d $2; then -- file=$2/$1 -+else -+ -+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -+# might cause directories to be created, which would be especially bad -+# if $src (and thus $dsttmp) contains '*'. -+ -+ if [ -f $src -o -d $src ] -+ then -+ true - else -- file=$2 -+ echo "install: $src does not exist" -+ exit 1 - fi -- /bin/rm -f $file -- ;; --esac -- --case $cmd in --/bin/mkdir ) -- if test ! -d "$file"; then -- $cmd $file -- fi -- ;; --* ) -- $cmd $1 $file -- if test -n "$strip"; then -- $strip $file -+ -+ if [ x"$dst" = x ] -+ then -+ echo "install: no destination specified" -+ exit 1 -+ else -+ true - fi -- ;; --esac - --if test -n "$chown"; then -- $chown $file -+# If destination is a directory, append the input filename; if your system -+# does not like double slashes in filenames, you may need to add some logic -+ -+ if [ -d $dst ] -+ then -+ dst="$dst"/`basename $src` -+ else -+ true -+ fi - fi --if test -n "$chgrp"; then -- $chgrp $file -+ -+## this sed command emulates the dirname command -+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` -+ -+# Make sure that the destination directory exists. -+# this part is taken from Noah Friedman's mkinstalldirs script -+ -+# Skip lots of stat calls in the usual case. -+if [ ! -d "$dstdir" ]; then -+defaultIFS=' -+' -+IFS="${IFS-${defaultIFS}}" -+ -+oIFS="${IFS}" -+# Some sh's can't handle IFS=/ for some reason. -+IFS='%' -+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -+IFS="${oIFS}" -+ -+pathcomp='' -+ -+while [ $# -ne 0 ] ; do -+ pathcomp="${pathcomp}${1}" -+ shift -+ -+ if [ ! -d "${pathcomp}" ] ; -+ then -+ $mkdirprog "${pathcomp}" -+ else -+ true -+ fi -+ -+ pathcomp="${pathcomp}/" -+done - fi --$chmod $file -+ -+if [ x"$dir_arg" != x ] -+then -+ $doit $instcmd $dst && -+ -+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && -+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && -+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && -+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -+else -+ -+# If we're going to rename the final executable, determine the name now. -+ -+ if [ x"$transformarg" = x ] -+ then -+ dstfile=`basename $dst` -+ else -+ dstfile=`basename $dst $transformbasename | -+ sed $transformarg`$transformbasename -+ fi -+ -+# don't allow the sed command to completely eliminate the filename -+ -+ if [ x"$dstfile" = x ] -+ then -+ dstfile=`basename $dst` -+ else -+ true -+ fi -+ -+# Make a temp file name in the proper directory. -+ -+ dsttmp=$dstdir/#inst.$$# -+ -+# Move or copy the file name to the temp name -+ -+ $doit $instcmd $src $dsttmp && -+ -+ trap "rm -f ${dsttmp}" 0 && -+ -+# and set any options; do chmod last to preserve setuid bits -+ -+# If any of these fail, we abort the whole thing. If we want to -+# ignore errors from any of these, just make sure not to ignore -+# errors from the above "$doit $instcmd $src $dsttmp" command. -+ -+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && -+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && -+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && -+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && -+ -+# Now rename the file to the real destination. -+ -+ $doit $rmcmd -f $dstdir/$dstfile && -+ $doit $mvcmd $dsttmp $dstdir/$dstfile -+ -+fi && -+ - - exit 0 diff --git a/epic4-0.9.11-patch1 b/epic4-0.9.11-patch1 deleted file mode 100644 index 2fbd2d8..0000000 --- a/epic4-0.9.11-patch1 +++ /dev/null @@ -1,20 +0,0 @@ -*** window.c.orig Tue Nov 7 16:14:33 2000 ---- window.c Tue Nov 7 16:14:43 2000 -*************** -*** 1818,1824 **** - tmp->current_channel = m_strdup(channel); - - /* Remove "waiting_channel" if we're waiting for this channel. ;-) */ -! if (tmp->waiting_channel && !my_stricmp(channel, tmp->waiting_channel)) - new_free(&tmp->waiting_channel); - tmp->update |= UPDATE_STATUS; - if (tmp->current_channel) ---- 1818,1825 ---- - tmp->current_channel = m_strdup(channel); - - /* Remove "waiting_channel" if we're waiting for this channel. ;-) */ -! if (tmp->waiting_channel && channel && -! !my_stricmp(channel, tmp->waiting_channel)) - new_free(&tmp->waiting_channel); - tmp->update |= UPDATE_STATUS; - if (tmp->current_channel) diff --git a/epic4-0.9.11-patch2 b/epic4-0.9.11-patch2 deleted file mode 100644 index 2875647..0000000 --- a/epic4-0.9.11-patch2 +++ /dev/null @@ -1,26 +0,0 @@ -*** screen.c.orig Wed Nov 8 10:10:15 2000 ---- screen.c Wed Nov 8 10:10:47 2000 -*************** -*** 383,391 **** - } - term_flush(); - -- if (must_free) -- new_free(&str); -- - /* - * This used to be in rite(), but since rite() is a general - * purpose function, and this stuff really is only intended ---- 383,388 ---- -*************** -*** 434,439 **** ---- 431,439 ---- - update_all_status(); - } - } -+ -+ if (must_free) -+ new_free(&str); - - cursor_in_display(window); - } diff --git a/epic4-0.9.13-patch1 b/epic4-0.9.13-patch1 deleted file mode 100644 index 1276a62..0000000 --- a/epic4-0.9.13-patch1 +++ /dev/null @@ -1,37 +0,0 @@ -*** timer.c.orig Thu Nov 30 15:08:21 2000 ---- timer.c Thu Nov 30 15:14:48 2000 -*************** -*** 183,188 **** ---- 183,189 ---- - - static TimerList * PendingTimers; - static char * current_exec_timer = empty_string; -+ static int parsingtimer = 0; - - /* - * ExecuteTimers: checks to see if any currently pending timers have -*************** -*** 196,202 **** - { - time_t now; - TimerList * current; -- static int parsingtimer = 0; - int old_from_server = from_server; - - /* ---- 197,202 ---- -*************** -*** 530,535 **** ---- 530,541 ---- - time_t current; - time_t timeout_in; - -+ /* -+ * If executing ExecuteTimers here would be invalid, then -+ * do not bother telling the caller we are ready. -+ */ -+ if (waiting_out > waiting_in || parsingtimer || !PendingTimers) -+ return 100000; - if (!PendingTimers) - return 100000; /* Absurdly large. */ - time(¤t); diff --git a/epic4-1.1.6.DESTDIR.patch b/epic4-1.1.6.DESTDIR.patch deleted file mode 100644 index ae84b1a..0000000 --- a/epic4-1.1.6.DESTDIR.patch +++ /dev/null @@ -1,437 +0,0 @@ -diff -urN epic4-1.1.6.orig/Makefile.in epic4-1.1.6/Makefile.in ---- epic4-1.1.6.orig/Makefile.in Fri Sep 13 16:16:56 2002 -+++ epic4-1.1.6/Makefile.in Fri Sep 13 16:23:30 2002 -@@ -72,9 +72,9 @@ - mandir = @mandir@ - - epic = @epic@ --epic_exe = $(bindir)/$(epic) --wserv_exe = $(libexecdir)/wserv4 --epicdir = $(sharedir)/$(epic) -+epic_exe = $(epic) -+wserv_exe = wserv4 -+epicdir = $(epic) - - ############ You ought not change anything below this line ################### - -@@ -111,23 +111,12 @@ - epic: source/Makefile Makefile - @cd source; $(MAKE2) all - --EPIC = $(epic_exe)-$(VERSION) -+EPIC = $(epic_exe) - EPIC_OLD = $(epic_exe).old - EPIC_LINK = $(epic_exe) - installepic installirc: epic installdirs test -- if ./my_test \( ! -f $(IP)$(EPIC) \) \ -- -o source/epic -nt $(IP)$(EPIC); then \ -- $(INSTALL_PROGRAM) source/epic $(IP)$(EPIC); \ -- if ./my_test -f $(IP)$(EPIC_OLD); then \ -- $(RM) $(IP)$(EPIC_OLD); \ -- fi; \ -- if ./my_test -f $(IP)$(EPIC_LINK); then \ -- $(MV) $(IP)$(EPIC_LINK) $(IP)$(EPIC_OLD); \ -- fi; \ -- $(RM) $(IP)$(EPIC_LINK); \ -- ln -s $(IP)$(EPIC) $(IP)$(EPIC_LINK); \ -- fi -- -+ $(INSTALL_PROGRAM) source/epic $(DESTDIR)$(bindir) -+ - # - # wserv - # -@@ -136,19 +125,16 @@ - - WSERV = $(wserv_exe) - installwserv: wserv4 installdirs test -- if ./my_test \( \! -f $(IP)$(WSERV) \) -o \ -- source/wserv4 -nt $(IP)$(WSERV); then \ -- $(INSTALL_PROGRAM) source/wserv4 $(IP)$(WSERV); \ -- fi -- -- -+ @srcdir@/mkinstalldirs $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) source/wserv4 $(DESTDIR)$(bindir) -+ - # - # Script library - # - scriptdir = $(epicdir)/script - installscript: installdirs test - -@( \ -- if ./my_test -f $(IP)$(scriptdir)/local; then \ -+ if ./my_test -f $(DESTDIR)$(scriptdir)/local; then \ - if ./my_test -f script/local; then \ - $(MV) @srcdir@/script/local \ - @srcdir@/script/local.orig; \ -@@ -161,7 +147,7 @@ - if ./my_test -x $$i; then \ - chmod a-x $$i; \ - fi; \ -- target=$(IP)$(scriptdir)/`basename $$i`; \ -+ target=$(DESTDIR)$(scriptdir)/`basename $$i`; \ - if ./my_test -f $$target; then \ - if ./my_test $$i -nt $$target; then \ - $(INSTALL_DATA) $$i $$target; \ -@@ -173,7 +159,7 @@ - fi; \ - else \ - $(INSTALL_DATA) $$i $$target; \ -- if ./my_test -f $(IP)$(scriptdir)/gzip-scripts; then \ -+ if ./my_test -f $(DESTDIR)$(scriptdir)/gzip-scripts; then \ - gzip -f $$target; \ - fi; \ - fi; \ -@@ -182,16 +168,16 @@ - - helpdir = $(epicdir)/help - installhelp: installdirs -- (cd @srcdir@/help; tar cf - .) | (cd $(IP)$(helpdir); tar xf -) -+ (cd @srcdir@/help; tar cf - .) | (cd $(DESTDIR)$(helpdir); tar xf -) - - installman: installdirs -- $(INSTALL_DATA) @srcdir@/doc/epic.1 $(IP)/$(mandir)/man1/$(epic).1 -+ $(INSTALL_DATA) @srcdir@/doc/epic.1 $(DESTDIR)/$(mandir)/man1/$(epic).1 - - installdirs: - umask 022; \ -- @srcdir@/mkinstalldirs $(IP)$(epicdir) $(IP)$(scriptdir) \ -- $(IP)$(helpdir) $(IP)$(bindir) $(IP)$(libexecdir) \ -- $(IP)$(mandir)/man1 -+ @srcdir@/mkinstalldirs $(DESTDIR)$(epicdir) $(DESTDIR)$(scriptdir) \ -+ $(DESTDIR)$(helpdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) \ -+ $(DESTDIR)$(mandir)/man1 - - test.o: @srcdir@/test.c - $(CC) -c @srcdir@/test.c -diff -urN epic4-0.9.15.org/bsdinstall epic4-0.9.15/bsdinstall ---- epic4-0.9.15.org/bsdinstall Sun Jan 7 11:39:32 2001 -+++ epic4-0.9.15/bsdinstall Sun Jan 7 11:39:41 2001 -@@ -1,90 +1,251 @@ --#! /bin/sh -+#!/bin/sh - # --# @(#)install.sh 4.5 (Berkeley) 10/12/83 -+# install - install a program, script, or datafile -+# This comes from X11R5 (mit/util/scripts/install.sh). - # --cmd=/bin/mv --strip="" --chmod="/bin/chmod 755" --chown="" --chgrp="" --while true ; do -- case $1 in -- -s ) strip="/bin/strip" -- shift -- ;; -- -c ) cmd="/bin/cp -p" -- shift -- ;; -- -m ) chmod="/bin/chmod $2" -- shift -- shift -- ;; -- -o ) chown="/etc/chown -f $2" -- shift -- shift -- ;; -- -g ) chgrp="/bin/chgrp -f $2" -- shift -- shift -- ;; -- -d ) cmd="/bin/mkdir" -- shift -- ;; -- * ) break -- ;; -- esac -+# Copyright 1991 by the Massachusetts Institute of Technology -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of M.I.T. not be used in advertising or -+# publicity pertaining to distribution of the software without specific, -+# written prior permission. M.I.T. makes no representations about the -+# suitability of this software for any purpose. It is provided "as is" -+# without express or implied warranty. -+# -+# Calling this script install-sh is preferred over install.sh, to prevent -+# `make' implicit rules from creating a file called install from it -+# when there is no Makefile. -+# -+# This script is compatible with the BSD install script, but was written -+# from scratch. It can only install one file at a time, a restriction -+# shared with many OS's install programs. -+ -+ -+# set DOITPROG to echo to test this script -+ -+# Don't use :- since 4.3BSD and earlier shells don't like it. -+doit="${DOITPROG-}" -+ -+ -+# put in absolute paths if you don't have them in your path; or use env. vars. -+ -+mvprog="${MVPROG-mv}" -+cpprog="${CPPROG-cp}" -+chmodprog="${CHMODPROG-chmod}" -+chownprog="${CHOWNPROG-chown}" -+chgrpprog="${CHGRPPROG-chgrp}" -+stripprog="${STRIPPROG-strip}" -+rmprog="${RMPROG-rm}" -+mkdirprog="${MKDIRPROG-mkdir}" -+ -+transformbasename="" -+transform_arg="" -+instcmd="$mvprog" -+chmodcmd="$chmodprog 0755" -+chowncmd="" -+chgrpcmd="" -+stripcmd="" -+rmcmd="$rmprog -f" -+mvcmd="$mvprog" -+src="" -+dst="" -+dir_arg="" -+ -+while [ x"$1" != x ]; do -+ case $1 in -+ -c) instcmd="$cpprog" -+ shift -+ continue;; -+ -+ -d) dir_arg=true -+ shift -+ continue;; -+ -+ -m) chmodcmd="$chmodprog $2" -+ shift -+ shift -+ continue;; -+ -+ -o) chowncmd="$chownprog $2" -+ shift -+ shift -+ continue;; -+ -+ -g) chgrpcmd="$chgrpprog $2" -+ shift -+ shift -+ continue;; -+ -+ -s) stripcmd="$stripprog" -+ shift -+ continue;; -+ -+ -t=*) transformarg=`echo $1 | sed 's/-t=//'` -+ shift -+ continue;; -+ -+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'` -+ shift -+ continue;; -+ -+ *) if [ x"$src" = x ] -+ then -+ src=$1 -+ else -+ # this colon is to work around a 386BSD /bin/sh bug -+ : -+ dst=$1 -+ fi -+ shift -+ continue;; -+ esac - done - --if test ! ${2-""}; then -- echo "install: no destination specified" -+if [ x"$src" = x ] -+then -+ echo "install: no input file specified" - exit 1 -+else -+ true - fi --if test ${3-""}; then -- echo "install: too many files specified -> $*" -- exit 1 --fi --if test $1 = $2 -o $2 = .; then -- echo "install: can't move $1 onto itself" -- exit 1 --fi --case $cmd in --/bin/mkdir ) -- file=$2/$1 -- ;; --* ) -- if test '!' -f $1; then -- echo "install: can't open $1" -- exit 1 -+ -+if [ x"$dir_arg" != x ]; then -+ dst=$src -+ src="" -+ -+ if [ -d $dst ]; then -+ instcmd=: -+ chmodcmd="" -+ else -+ instcmd=mkdir - fi -- if test -d $2; then -- file=$2/$1 -+else -+ -+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -+# might cause directories to be created, which would be especially bad -+# if $src (and thus $dsttmp) contains '*'. -+ -+ if [ -f $src -o -d $src ] -+ then -+ true - else -- file=$2 -+ echo "install: $src does not exist" -+ exit 1 - fi -- /bin/rm -f $file -- ;; --esac -- --case $cmd in --/bin/mkdir ) -- if test ! -d "$file"; then -- $cmd $file -- fi -- ;; --* ) -- $cmd $1 $file -- if test -n "$strip"; then -- $strip $file -+ -+ if [ x"$dst" = x ] -+ then -+ echo "install: no destination specified" -+ exit 1 -+ else -+ true - fi -- ;; --esac - --if test -n "$chown"; then -- $chown $file -+# If destination is a directory, append the input filename; if your system -+# does not like double slashes in filenames, you may need to add some logic -+ -+ if [ -d $dst ] -+ then -+ dst="$dst"/`basename $src` -+ else -+ true -+ fi - fi --if test -n "$chgrp"; then -- $chgrp $file -+ -+## this sed command emulates the dirname command -+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` -+ -+# Make sure that the destination directory exists. -+# this part is taken from Noah Friedman's mkinstalldirs script -+ -+# Skip lots of stat calls in the usual case. -+if [ ! -d "$dstdir" ]; then -+defaultIFS=' -+' -+IFS="${IFS-${defaultIFS}}" -+ -+oIFS="${IFS}" -+# Some sh's can't handle IFS=/ for some reason. -+IFS='%' -+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -+IFS="${oIFS}" -+ -+pathcomp='' -+ -+while [ $# -ne 0 ] ; do -+ pathcomp="${pathcomp}${1}" -+ shift -+ -+ if [ ! -d "${pathcomp}" ] ; -+ then -+ $mkdirprog "${pathcomp}" -+ else -+ true -+ fi -+ -+ pathcomp="${pathcomp}/" -+done - fi --$chmod $file -+ -+if [ x"$dir_arg" != x ] -+then -+ $doit $instcmd $dst && -+ -+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && -+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && -+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && -+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -+else -+ -+# If we're going to rename the final executable, determine the name now. -+ -+ if [ x"$transformarg" = x ] -+ then -+ dstfile=`basename $dst` -+ else -+ dstfile=`basename $dst $transformbasename | -+ sed $transformarg`$transformbasename -+ fi -+ -+# don't allow the sed command to completely eliminate the filename -+ -+ if [ x"$dstfile" = x ] -+ then -+ dstfile=`basename $dst` -+ else -+ true -+ fi -+ -+# Make a temp file name in the proper directory. -+ -+ dsttmp=$dstdir/#inst.$$# -+ -+# Move or copy the file name to the temp name -+ -+ $doit $instcmd $src $dsttmp && -+ -+ trap "rm -f ${dsttmp}" 0 && -+ -+# and set any options; do chmod last to preserve setuid bits -+ -+# If any of these fail, we abort the whole thing. If we want to -+# ignore errors from any of these, just make sure not to ignore -+# errors from the above "$doit $instcmd $src $dsttmp" command. -+ -+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && -+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && -+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && -+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && -+ -+# Now rename the file to the real destination. -+ -+ $doit $rmcmd -f $dstdir/$dstfile && -+ $doit $mvcmd $dsttmp $dstdir/$dstfile -+ -+fi && -+ - - exit 0 diff --git a/epic4-ac.patch b/epic4-ac.patch deleted file mode 100644 index 1bd3eb7..0000000 --- a/epic4-ac.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN epic4-1.0.1.org/configure.in epic4-1.0.1/configure.in ---- epic4-1.0.1.org/configure.in Sun Dec 30 18:16:10 2001 -+++ epic4-1.0.1/configure.in Sun Dec 30 18:16:29 2001 -@@ -218,8 +218,8 @@ - dnl originally wanted to have it around, but svr3 insisted not so. (grrr) - dnl - --AC_CHECK_FUNC(getpgid, AC_DEFINE(HAVE_GETPGID),) --AC_CHECK_FUNC(getpgrp, AC_FUNC_GETPGRP,) -+AC_CHECK_FUNC(getpgid, [AC_DEFINE(HAVE_GETPGID)],) -+AC_CHECK_FUNC(getpgrp, [AC_FUNC_GETPGRP],) - - - dnl ---------------------------------------------------------- diff --git a/epic4-missing-terminating-char.patch b/epic4-missing-terminating-char.patch deleted file mode 100644 index f2f1650..0000000 --- a/epic4-missing-terminating-char.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- epic4-1.1.7/source/server.c.orig 2003-07-20 09:47:35.000000000 +0200 -+++ epic4-1.1.7/source/server.c 2003-07-20 09:46:57.000000000 +0200 -@@ -2172,8 +2172,8 @@ - - if (!(host = strchr(userhost, '@'))) - { -- yell("Cannot set your userhost to [%s] because it does not -- contain a @ character!", userhost); -+ yell("Cannot set your userhost to [%s] because it does not " -+ "contain a @ character!", userhost); - return; - } - diff --git a/epic4-paste.patch b/epic4-paste.patch deleted file mode 100644 index da576b8..0000000 --- a/epic4-paste.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -dur epic4-1.1.7.orig/source/info.c.sh.in epic4-1.1.7/source/info.c.sh.in ---- epic4-1.1.7.orig/source/info.c.sh.in 2000-12-05 01:11:57.000000000 +0100 -+++ epic4-1.1.7/source/info.c.sh.in 2004-02-02 14:22:08.189155740 +0100 -@@ -36,6 +36,6 @@ - const char *compile_host = "$comp_host"; - const char *compile_time = "$comp_time"; - const char *info_c_sum = "$info_c_sum"; --const char *compile_info = my_paste("Compiled by ", USER, "@$comp_host on $comp_time"); -+const char *compile_info = "Compiled by " USER "@$comp_host on $comp_time"; - - __E__O__F__ diff --git a/epic4-security-CAN-2003-0328.patch b/epic4-security-CAN-2003-0328.patch deleted file mode 100644 index 6524784..0000000 --- a/epic4-security-CAN-2003-0328.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN epic4-1.0.1.orig/source/ctcp.c epic4-1.0.1/source/ctcp.c ---- epic4-1.0.1.orig/source/ctcp.c 2000-12-05 01:11:56.000000000 +0100 -+++ epic4-1.0.1/source/ctcp.c 2004-05-12 12:51:18.539497392 +0200 -@@ -898,6 +898,8 @@ - - /* Make sure that the final \001 doesnt get truncated */ - len = IRCD_BUFFER_SIZE - (12 + strlen(to)); -+ if ((len = IRCD_BUFFER_SIZE - (12 + strlen(to))) < 0) -+ return; - putbuf2 = alloca(len); - - if (format) diff --git a/epic4pre2.508-make.patch b/epic4pre2.508-make.patch deleted file mode 100644 index fc0957c..0000000 --- a/epic4pre2.508-make.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Nru epic4pre2.508.orig/Makefile.in epic4pre2.508/Makefile.in ---- epic4pre2.508.orig/Makefile.in Sat Apr 22 21:04:06 2000 -+++ epic4pre2.508/Makefile.in Sat Apr 22 21:05:34 2000 -@@ -73,7 +73,7 @@ - - epic = @epic@ - epic_exe = $(bindir)/$(epic) --wserv_exe = $(libexecdir)/wserv -+wserv_exe = $(libexecdir)/wserv-epic4 - epicdir = $(sharedir)/$(epic) - - ############ You ought not change anything below this line ################### -@@ -125,7 +125,7 @@ - $(MV) $(IP)$(EPIC_LINK) $(IP)$(EPIC_OLD); \ - fi; \ - $(RM) $(IP)$(EPIC_LINK); \ -- ln -s $(IP)$(EPIC) $(IP)$(EPIC_LINK); \ -+ mv -f $(IP)$(EPIC) $(IP)$(EPIC_LINK); \ - fi - - # -diff -Nru epic4pre2.508.orig/include/config.h epic4pre2.508/include/config.h ---- epic4pre2.508.orig/include/config.h Sat Apr 22 21:04:06 2000 -+++ epic4pre2.508/include/config.h Sat Apr 22 21:08:29 2000 -@@ -42,7 +42,7 @@ - * the client will NOT compile and work properly! Use the default here if - * you dont have other servers to use. - */ --#define DEFAULT_SERVER "localhost irc.efnet.net irc.undernet.org irc.dal.net" -+#define DEFAULT_SERVER "poznan.irc.pl krakow.irc.pl warszawa.irc.pl lublin.irc.pl" - - /* - * The left and right brace characters ('{', '}') are special characters in -@@ -269,7 +269,7 @@ - * settings. Useful for paranoid users who dont want others to know - * that theyre running a buggy SunOS machine. >;-) - */ --#undef UNAME_HACK -+#define UNAME_HACK - - - /* And here is the port number for default client connections. */ -@@ -282,7 +282,7 @@ - * hostname:portnum:password (with the portnum and password being - * optional). This server list will supercede the DEFAULT_SERVER - */ --#define SERVERS_FILE "ircII.servers" -+#define SERVERS_FILE "/etc/irc/ircII.servers" - - - /* -@@ -338,7 +338,7 @@ - #define DEFAULT_BOLD_VIDEO 1 - #define DEFAULT_CHANNEL_NAME_WIDTH 0 - #define DEFAULT_CLOCK 1 --#define DEFAULT_CLOCK_24HOUR 0 -+#define DEFAULT_CLOCK_24HOUR 1 - #define DEFAULT_CLOCK_FORMAT NULL - #define DEFAULT_CMDCHARS "/" - #define DEFAULT_COLOR 1 -@@ -384,7 +384,7 @@ - #define DEFAULT_LASTLOG 256 - #define DEFAULT_LASTLOG_LEVEL "ALL" - #define DEFAULT_LOG 0 --#define DEFAULT_LOGFILE "irc.log" -+#define DEFAULT_LOGFILE ".irc.log" - #define DEFAULT_MAIL 2 - #define DEFAULT_MAX_RECONNECTS 4 - #define DEFAULT_META_STATES 40 -@@ -515,7 +515,7 @@ - #undef EMACS_KEYBINDINGS /* meta-key keybindings. */ - #undef EPIC_DEBUG /* force coredump on panic */ - #define EXEC_COMMAND /* allow /exec comamnd */ --#undef HACKED_DCC_WARNING /* warn if handshake != sender */ -+#define HACKED_DCC_WARNING /* warn if handshake != sender */ - #undef HARD_UNFLASH /* do a hard reset instead of soft on refresh */ - #undef NO_BOTS /* no bots allowed */ - #undef NO_CHEATING /* always do it the "right" way, no shortcuts */ -diff -Nru epic4pre2.508.orig/script/global epic4pre2.508/script/global ---- epic4pre2.508.orig/script/global Sat Apr 22 21:04:06 2000 -+++ epic4pre2.508/script/global Sat Apr 22 21:09:02 2000 -@@ -10,4 +10,4 @@ - load 2.8script - # If you want this script, load it in your .ircrc - #load newaway --load local -+#load local