Date: Tue, 29 Jul 2014 15:00:13 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363335 - in head/sysutils: afio/files asfsm/files bkpupsd/files cdrtools-devel/files cdrtools/files consolehm/files copytape copytape/files detach/files fetchlog/files fortunelock fort... Message-ID: <201407291500.s6TF0DaL027509@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Jul 29 15:00:12 2014 New Revision: 363335 URL: http://svnweb.freebsd.org/changeset/ports/363335 QAT: https://qat.redports.org/buildarchive/r363335/ Log: Rename sysutils/ patch-xy patches to reflect the files they modify. Added: head/sysutils/afio/files/patch-afio.c - copied unchanged from r363316, head/sysutils/afio/files/patch-ab head/sysutils/afio/files/patch-afio.h - copied unchanged from r363316, head/sysutils/afio/files/patch-ac head/sysutils/afio/files/patch-compfile.c - copied unchanged from r363316, head/sysutils/afio/files/patch-ad head/sysutils/asfsm/files/patch-asfsm.c - copied unchanged from r363316, head/sysutils/asfsm/files/patch-aa head/sysutils/bkpupsd/files/patch-src__bkpupsd.c - copied unchanged from r363316, head/sysutils/bkpupsd/files/patch-ab head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd head/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-ad head/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1 head/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1 head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl head/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h head/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8 head/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-readcd::readcd.1 head/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl head/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 - copied unchanged from r363316, head/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1 head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-ad head/sysutils/cdrtools/files/patch-btcflash__btcflash.1 - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-btcflash::btcflash.1 head/sysutils/cdrtools/files/patch-cdrecord__README.rscsi - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-cdrecord::README.rscsi head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl head/sysutils/cdrtools/files/patch-include__schily__sha2.h - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-include::schily::sha2.h head/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8 head/sysutils/cdrtools/files/patch-readcd__readcd.1 - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-readcd::readcd.1 head/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl head/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 - copied unchanged from r363316, head/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 head/sysutils/consolehm/files/patch-chm.h - copied unchanged from r363316, head/sysutils/consolehm/files/patch-aa head/sysutils/consolehm/files/patch-configure - copied unchanged from r363316, head/sysutils/consolehm/files/patch-ab head/sysutils/consolehm/files/patch-configure.in - copied unchanged from r363316, head/sysutils/consolehm/files/patch-ac head/sysutils/copytape/files/patch-copytape.c_1 - copied unchanged from r363316, head/sysutils/copytape/files/patch-aa head/sysutils/copytape/files/patch-copytape.c_2 - copied unchanged from r363316, head/sysutils/copytape/files/patch-ab head/sysutils/detach/files/patch-Makefile - copied unchanged from r363316, head/sysutils/detach/files/patch-aa head/sysutils/fetchlog/files/patch-Makefile - copied unchanged from r363316, head/sysutils/fetchlog/files/patch-aa head/sysutils/fortunelock/files/patch-Makefile - copied unchanged from r363316, head/sysutils/fortunelock/files/patch-aa head/sysutils/gkrellm2/files/patch-gkrellm.1 - copied unchanged from r363316, head/sysutils/gkrellm2/files/patch-af head/sysutils/gkrellm2/files/patch-server__Makefile - copied unchanged from r363316, head/sysutils/gkrellm2/files/patch-server::Makefile head/sysutils/gkrellm2/files/patch-server__gkrellmd.h - copied unchanged from r363316, head/sysutils/gkrellm2/files/patch-server::gkrellmd.h head/sysutils/gkrellm2/files/patch-src__configure - copied unchanged from r363316, head/sysutils/gkrellm2/files/patch-src::configure head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c - copied unchanged from r363316, head/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c head/sysutils/hfsutils/files/patch-Makefile.in - copied unchanged from r363316, head/sysutils/hfsutils/files/patch-ab head/sysutils/ipsc/files/patch-Makefile - copied unchanged from r363316, head/sysutils/ipsc/files/patch-ae head/sysutils/less/files/patch-Makefile.in - copied unchanged from r363316, head/sysutils/less/files/patch-aa head/sysutils/less/files/patch-charset.c - copied unchanged from r363316, head/sysutils/less/files/patch-ab head/sysutils/linuxfdisk/files/patch-FreeBSD - copied unchanged from r363316, head/sysutils/linuxfdisk/files/patch-aa head/sysutils/lmmon/files/patch-Makefile.in - copied unchanged from r363316, head/sysutils/lmmon/files/patch-aa head/sysutils/logtool/files/patch-src__includes.h - copied unchanged from r363316, head/sysutils/logtool/files/patch-ab head/sysutils/mgeupsd/files/patch-Makefile - copied unchanged from r363316, head/sysutils/mgeupsd/files/patch-ab head/sysutils/mgeupsd/files/patch-mgeupsd.c - copied unchanged from r363316, head/sysutils/mgeupsd/files/patch-aa head/sysutils/monitord/files/patch-monitord.c - copied unchanged from r363316, head/sysutils/monitord/files/patch-ab head/sysutils/most/files/patch-src__Makefile.in - copied unchanged from r363316, head/sysutils/most/files/patch-aa head/sysutils/paicc/files/patch-Makefile - copied unchanged from r363316, head/sysutils/paicc/files/patch-aa head/sysutils/paicc/files/patch-evap__evap.c - copied unchanged from r363316, head/sysutils/paicc/files/patch-ab head/sysutils/paicc/files/patch-paicc.c - copied unchanged from r363316, head/sysutils/paicc/files/patch-ac head/sysutils/pftop/files/patch-config.h - copied unchanged from r363316, head/sysutils/pftop/files/patch-aa head/sysutils/rtty/files/patch-Makefile - copied unchanged from r363316, head/sysutils/rtty/files/patch-aa head/sysutils/rtty/files/patch-startsrv.sh - copied unchanged from r363316, head/sysutils/rtty/files/patch-ab head/sysutils/screen-legacy/files/patch-Makefile.in_1 - copied unchanged from r363316, head/sysutils/screen-legacy/files/patch-Makefile.in head/sysutils/screen-legacy/files/patch-Makefile.in_2 - copied unchanged from r363316, head/sysutils/screen-legacy/files/patch-aa head/sysutils/screen-legacy/files/patch-configure - copied unchanged from r363316, head/sysutils/screen-legacy/files/patch-ad head/sysutils/screen-legacy/files/patch-doc__Makefile.in - copied unchanged from r363316, head/sysutils/screen-legacy/files/patch-ab head/sysutils/screen-legacy/files/patch-termcap.c - copied unchanged from r363316, head/sysutils/screen-legacy/files/patch-af head/sysutils/screen-legacy/files/patch-terminfo__checktc.c - copied unchanged from r363316, head/sysutils/screen-legacy/files/patch-terminfo::checktc.c head/sysutils/screen/files/patch-Makefile.in - copied unchanged from r363316, head/sysutils/screen/files/patch-aa head/sysutils/screen/files/patch-configure - copied unchanged from r363316, head/sysutils/screen/files/patch-ad head/sysutils/screen/files/patch-doc__Makefile.in - copied unchanged from r363316, head/sysutils/screen/files/patch-ab head/sysutils/screen/files/patch-termcap.c - copied unchanged from r363316, head/sysutils/screen/files/patch-af head/sysutils/screen/files/patch-terminfo__checktc.c - copied unchanged from r363316, head/sysutils/screen/files/patch-terminfo::checktc.c head/sysutils/setquota/files/patch-Makefile - copied unchanged from r363316, head/sysutils/setquota/files/patch-aa head/sysutils/setquota/files/patch-printquota.c - copied unchanged from r363316, head/sysutils/setquota/files/patch-ab head/sysutils/setquota/files/patch-setquota.c - copied unchanged from r363316, head/sysutils/setquota/files/patch-ac head/sysutils/skill/files/patch-Makefile - copied unchanged from r363316, head/sysutils/skill/files/patch-aa head/sysutils/socket/files/patch-Headerfix - copied unchanged from r363316, head/sysutils/socket/files/patch-aa head/sysutils/socket/files/patch-Makefile_1 - copied unchanged from r363316, head/sysutils/socket/files/patch-Makefile head/sysutils/socket/files/patch-Makefile_2 - copied unchanged from r363316, head/sysutils/socket/files/patch-ab head/sysutils/socket/files/patch-globals.h - copied unchanged from r363316, head/sysutils/socket/files/patch-ad head/sysutils/socket/files/patch-socket.c - copied unchanged from r363316, head/sysutils/socket/files/patch-ae head/sysutils/socket/files/patch-socketp.c - copied unchanged from r363316, head/sysutils/socket/files/patch-af head/sysutils/socket/files/patch-utils.c - copied unchanged from r363316, head/sysutils/socket/files/patch-ag head/sysutils/su2/files/patch-Makefile - copied unchanged from r363316, head/sysutils/su2/files/patch-aa head/sysutils/su2/files/patch-su2.c_1 - copied unchanged from r363316, head/sysutils/su2/files/patch-ab head/sysutils/su2/files/patch-su2.c_2 - copied unchanged from r363316, head/sysutils/su2/files/patch-su2-c head/sysutils/su2/files/patch-su2.man - copied unchanged from r363316, head/sysutils/su2/files/patch-ac head/sysutils/symlinks/files/patch-symlinks.c - copied unchanged from r363316, head/sysutils/symlinks/files/patch-aa head/sysutils/tcplist/files/patch-Makefile - copied unchanged from r363316, head/sysutils/tcplist/files/patch-01 head/sysutils/tcplist/files/patch-lsof.c - copied unchanged from r363316, head/sysutils/tcplist/files/patch-03 head/sysutils/tcplist/files/patch-tcplist.1 - copied unchanged from r363316, head/sysutils/tcplist/files/patch-02 head/sysutils/webmin/files/patch-setup.sh - copied unchanged from r363316, head/sysutils/webmin/files/patch-aa head/sysutils/whowatch/files/patch-Makefile.in - copied unchanged from r363316, head/sysutils/whowatch/files/patch-aa head/sysutils/wmtop/files/patch-Makefile - copied unchanged from r363316, head/sysutils/wmtop/files/patch-aa head/sysutils/wmtop/files/patch-wmtop.c - copied unchanged from r363316, head/sysutils/wmtop/files/patch-la head/sysutils/xbatt/files/patch-Imakefile - copied unchanged from r363316, head/sysutils/xbatt/files/patch-aa head/sysutils/xbattbar/files/patch-Imakefile - copied unchanged from r363316, head/sysutils/xbattbar/files/patch-aa head/sysutils/xdu/files/patch-xdu.c - copied unchanged from r363316, head/sysutils/xdu/files/patch-aa head/sysutils/xfsm/files/patch-xfsm_util.c - copied unchanged from r363316, head/sysutils/xfsm/files/patch-ac Deleted: head/sysutils/afio/files/patch-ab head/sysutils/afio/files/patch-ac head/sysutils/afio/files/patch-ad head/sysutils/asfsm/files/patch-aa head/sysutils/bkpupsd/files/patch-ab head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd head/sysutils/cdrtools-devel/files/patch-ad head/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1 head/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1 head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h head/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8 head/sysutils/cdrtools-devel/files/patch-readcd::readcd.1 head/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl head/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1 head/sysutils/cdrtools/files/patch-ad head/sysutils/cdrtools/files/patch-btcflash::btcflash.1 head/sysutils/cdrtools/files/patch-cdrecord::README.rscsi head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl head/sysutils/cdrtools/files/patch-include::schily::sha2.h head/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8 head/sysutils/cdrtools/files/patch-readcd::readcd.1 head/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl head/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 head/sysutils/consolehm/files/patch-aa head/sysutils/consolehm/files/patch-ab head/sysutils/consolehm/files/patch-ac head/sysutils/copytape/files/patch-aa head/sysutils/copytape/files/patch-ab head/sysutils/detach/files/patch-aa head/sysutils/fetchlog/files/patch-aa head/sysutils/fortunelock/files/patch-aa head/sysutils/gkrellm2/files/patch-af head/sysutils/gkrellm2/files/patch-server::Makefile head/sysutils/gkrellm2/files/patch-server::gkrellmd.h head/sysutils/gkrellm2/files/patch-src::configure head/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c head/sysutils/hfsutils/files/patch-ab head/sysutils/ipsc/files/patch-ae head/sysutils/less/files/patch-aa head/sysutils/less/files/patch-ab head/sysutils/linuxfdisk/files/patch-aa head/sysutils/lmmon/files/patch-aa head/sysutils/logtool/files/patch-ab head/sysutils/mgeupsd/files/patch-aa head/sysutils/mgeupsd/files/patch-ab head/sysutils/monitord/files/patch-ab head/sysutils/most/files/patch-aa head/sysutils/paicc/files/patch-aa head/sysutils/paicc/files/patch-ab head/sysutils/paicc/files/patch-ac head/sysutils/pftop/files/patch-aa head/sysutils/rtty/files/patch-aa head/sysutils/rtty/files/patch-ab head/sysutils/screen-legacy/files/patch-Makefile.in head/sysutils/screen-legacy/files/patch-aa head/sysutils/screen-legacy/files/patch-ab head/sysutils/screen-legacy/files/patch-ad head/sysutils/screen-legacy/files/patch-af head/sysutils/screen-legacy/files/patch-terminfo::checktc.c head/sysutils/screen/files/patch-aa head/sysutils/screen/files/patch-ab head/sysutils/screen/files/patch-ad head/sysutils/screen/files/patch-af head/sysutils/screen/files/patch-terminfo::checktc.c head/sysutils/setquota/files/patch-aa head/sysutils/setquota/files/patch-ab head/sysutils/setquota/files/patch-ac head/sysutils/skill/files/patch-aa head/sysutils/socket/files/patch-Makefile head/sysutils/socket/files/patch-aa head/sysutils/socket/files/patch-ab head/sysutils/socket/files/patch-ad head/sysutils/socket/files/patch-ae head/sysutils/socket/files/patch-af head/sysutils/socket/files/patch-ag head/sysutils/su2/files/patch-aa head/sysutils/su2/files/patch-ab head/sysutils/su2/files/patch-ac head/sysutils/su2/files/patch-su2-c head/sysutils/symlinks/files/patch-aa head/sysutils/tcplist/files/patch-01 head/sysutils/tcplist/files/patch-02 head/sysutils/tcplist/files/patch-03 head/sysutils/webmin/files/patch-aa head/sysutils/whowatch/files/patch-aa head/sysutils/wmtop/files/patch-aa head/sysutils/wmtop/files/patch-la head/sysutils/xbatt/files/patch-aa head/sysutils/xbattbar/files/patch-aa head/sysutils/xdu/files/patch-aa head/sysutils/xfsm/files/patch-ac Modified: head/sysutils/copytape/Makefile head/sysutils/fortunelock/Makefile head/sysutils/linuxfdisk/Makefile head/sysutils/skill/Makefile head/sysutils/xdu/Makefile head/sysutils/xfsm/Makefile Copied: head/sysutils/afio/files/patch-afio.c (from r363316, head/sysutils/afio/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/afio/files/patch-afio.c Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/afio/files/patch-ab) @@ -0,0 +1,83 @@ +*** afio.c.orig Sat Dec 20 17:16:13 2003 +--- afio.c Sat Jan 21 17:31:23 2006 +*************** +*** 648,658 **** + daniel.andersson@sto.sema.se */ + fprintf (stderr, "Media size %ld is less than block size %d\n", + aruntil, arbsize); + #else + fprintf (stderr, "Media size %ld is less than block size %d\n", +! (unsigned long) aruntil, arbsize); + #endif + usage (); + } + if (arpad == 0) + arpad = arbsize; +--- 648,658 ---- + daniel.andersson@sto.sema.se */ + fprintf (stderr, "Media size %ld is less than block size %d\n", + aruntil, arbsize); + #else + fprintf (stderr, "Media size %ld is less than block size %d\n", +! (u_long) aruntil, arbsize); + #endif + usage (); + } + if (arpad == 0) + arpad = arbsize; +*************** +*** 3155,3168 **** + return (warn (name, syserr ())); + else + exists = 0; + } + +! if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0 + && (errno != ENOENT + || dirneed (name) < 0 +! || mknod (name, asb->sb_mode, asb->sb_rdev) < 0)) + return (warn (name, syserr ())); + break; + case S_IFDIR: + if (exists) + { +--- 3155,3168 ---- + return (warn (name, syserr ())); + else + exists = 0; + } + +! if (mkfifo (name, asb->sb_mode) < 0 + && (errno != ENOENT + || dirneed (name) < 0 +! || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + case S_IFDIR: + if (exists) + { +*************** +*** 3194,3204 **** + || dirneed (name) < 0 + || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + #endif /* S_IFIFO */ +! #ifdef S_IFSOCK + case S_IFSOCK: + fd = 0; + if (exists) + if (perm != operm && chmod (name, perm) < 0) + return (warn (name, syserr ())); +--- 3194,3204 ---- + || dirneed (name) < 0 + || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + #endif /* S_IFIFO */ +! #ifdef S_IFSOCK && !defined (__FreeBSD__) + case S_IFSOCK: + fd = 0; + if (exists) + if (perm != operm && chmod (name, perm) < 0) + return (warn (name, syserr ())); Copied: head/sysutils/afio/files/patch-afio.h (from r363316, head/sysutils/afio/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/afio/files/patch-afio.h Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/afio/files/patch-ac) @@ -0,0 +1,12 @@ +--- afio.h.orig Sun Sep 20 04:04:54 1998 ++++ afio.h Wed Dec 9 01:33:32 1998 +@@ -1,5 +1,9 @@ + /* afio.h defines for afio. */ + ++#ifdef HAVE_PARAM_H ++#include <sys/param.h> ++#endif ++ + #ifdef SYSTIME + #include <sys/time.h> + #else /* SYSTIME */ Copied: head/sysutils/afio/files/patch-compfile.c (from r363316, head/sysutils/afio/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/afio/files/patch-compfile.c Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/afio/files/patch-ad) @@ -0,0 +1,11 @@ +--- compfile.c.orig Thu Nov 25 22:22:28 1999 ++++ compfile.c Thu Jan 27 14:36:31 2000 +@@ -207,7 +207,7 @@ + * version; + */ + +-#if ( defined(sun) && defined(__svr4__) ) ++#if ( defined(sun) && defined(__svr4__) || defined(__FreeBSD__) ) + #include <dirent.h> + #else + #include <sys/dir.h> Copied: head/sysutils/asfsm/files/patch-asfsm.c (from r363316, head/sysutils/asfsm/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/asfsm/files/patch-asfsm.c Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/asfsm/files/patch-aa) @@ -0,0 +1,80 @@ + +$FreeBSD$ + +--- asfsm.c.orig Sun Oct 18 12:02:09 1998 ++++ asfsm.c Thu Aug 15 23:19:02 2002 +@@ -2,10 +2,10 @@ + /* Author: David Muse <mused@examco.com> 1997 */ + #include <stdio.h> + #include <string.h> +-#include <Xlib.h> +-#include <Intrinsic.h> +-#include <xpm.h> +-#include <extensions/shape.h> ++#include <X11/Xlib.h> ++#include <X11/Intrinsic.h> ++#include <X11/xpm.h> ++#include <X11/extensions/shape.h> + #ifdef SIXTEENBIT + #include "16bit/surreal.xpm" + #include "16bit/purplestoneswirl.xpm" +@@ -98,10 +98,10 @@ + int flag=0; + + /* figure out which "df -" command to use */ +- tempfile=popen("df -Bk","r"); ++ tempfile=popen("df -k","r"); + fscanf(tempfile,"%s",word); + if (!strcmp(word,"Filesystem")) { +- sprintf(dfcommand,"df -Bk"); ++ sprintf(dfcommand,"df -k"); + } else { + tempfile=popen("df -a","r"); + fscanf(tempfile,"%s",word); +@@ -135,27 +135,6 @@ + } + fclose(tempfile); + +- /* detect which user mount/unmount command to use */ +- /* by giving umnt a bum parameter (-h) and seeing if it */ +- /* returns anything about an illegal option or if it just says */ +- /* command not found. Different shells have different messages */ +- /* for not finding a command, and which behaves differently too, */ +- /* so this seems a reasonable way to do it. */ +- tempfile=popen("umnt -h > /usr/tmp/testumnt 2> /usr/tmp/testumnt; cat /usr/tmp/testumnt; rm /usr/tmp/testumnt","r"); +- while(!feof(tempfile)) { +- fscanf(tempfile,"%s",word); +- if (!strcmp("option",word)) { +- /* the response must have been +- umnt: ERROR: Illegal option -- h +- or something like it, the command exists */ +- sprintf(mountcmd,"mnt "); +- sprintf(umountcmd,"umnt "); +- flag=1; +- break; +- } +- } +- pclose(tempfile); +- + if (flag==0) { + /* otherwise, the mount/unmount commands must be used */ + sprintf(mountcmd,"mount "); +@@ -374,7 +353,8 @@ + fs[counter].percent, + fs[counter].mountdir); + if (strlen(fs[counter].mountdir)>0 && counter<23) { +- if (atoi(fs[counter].blocks)>0 || showzero==1) { ++ if ((atoi(fs[counter].blocks)>0 || showzero==1) && ++ (strcmp(fs[counter].mountdir, "/proc"))){ + counter++; + } + } else { +@@ -721,7 +701,7 @@ + }; + + if (!feof(fstabfile)) { +- if (buffer[0]!='#') { ++ if (buffer[0]!='#' && strncmp(buffer, "proc", 4)) { + strcpy(fstab[fstabcounter].filesystem, + ""); + strcpy(fstab[fstabcounter].mountdir,""); Copied: head/sysutils/bkpupsd/files/patch-src__bkpupsd.c (from r363316, head/sysutils/bkpupsd/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bkpupsd/files/patch-src__bkpupsd.c Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/bkpupsd/files/patch-ab) @@ -0,0 +1,58 @@ +--- src/bkpupsd.c.orig Sun Aug 3 20:11:23 1997 ++++ src/bkpupsd.c Fri Dec 15 00:53:52 2006 +@@ -27,14 +27,17 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> + #include <fcntl.h> + #include <err.h> + #include <errno.h> ++#include <string.h> + #include <sys/types.h> + #include <sys/ioctl.h> + #include <signal.h> + #include <syslog.h> +-#include <varargs.h> ++#include <stdarg.h> + + #define POWER_TIMEOUT 5*60 + #define DEFAULT_PORT "/dev/cuaa1" +@@ -44,16 +47,17 @@ + #define SH_RESTORED "/usr/local/libexec/bkpupsd/bkpups.restored" + #define SH_BATTLOW "/usr/local/libexec/bkpupsd/bkpups.battlow" + ++int makepid(char *s); ++void execomand(); ++ + int main(argc, argv) + int argc; + char **argv; + { + int fd; + int lstatus; +- int flags; + int rts_bit = TIOCM_RTS; + int dtr_bit = TIOCM_DTR; +- int rng_bit = TIOCM_RNG; + int pfail = 0; + int pfcount = 0; + int prcount = 0; +@@ -63,7 +67,6 @@ + char *sh_restored = SH_RESTORED; + char *sh_battlow = SH_BATTLOW; + char *ups_port = DEFAULT_PORT; +- static void execomand(); + + /* open ups port */ + if(argc > 2) { +@@ -179,7 +182,7 @@ + pid = getpid(); + if((fp = fopen(s, "w")) == NULL) + return -1; +- fprintf(fp, "%ld\n", pid); ++ fprintf(fp, "%lu\n", (u_long)pid); + fclose(fp); + return 0; + } Copied: head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd (from r363316, head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- DEFAULTS/Defaults.freebsd.orig 2013-11-04 21:58:20.000000000 +0100 ++++ DEFAULTS/Defaults.freebsd 2014-02-03 01:16:19.000000000 +0100 +@@ -29,8 +29,8 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-DEFOSINCDIRS= /usr/local/include +-LDPATH= -L/opt/schily/lib -L/usr/local/lib ++#DEFOSINCDIRS= /usr/local/include ++#LDPATH= -L/opt/schily/lib -L/usr/local/lib + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) Will probably not work + + ########################################################################### Copied: head/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul (from r363316, head/sysutils/cdrtools-devel/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-ad) @@ -0,0 +1,84 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 ++++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 +@@ -22,8 +22,9 @@ + ########################################################################### + + CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX) +-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) +-C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) ++XCFLAGS:= $(CFLAGS) ++CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) ++C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX) + + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) + COPTS= +@@ -31,12 +32,10 @@ + CWOPTS= -Wall -Wtraditional + CWOPTS= -Wall -Wno-unknown-pragmas \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +-COPTOPT= -O + COPTDYN= -fpic + COPTGPROF= -pg + C++OPTS= + C++WOPTS= $(CWOPTS) +-C++OPTOPT= $(COPTOPT) + C++OPTDYN= -fpic + C++OPTGPROF= -pg + +@@ -56,28 +55,18 @@ + + FLOAT_OPTIONS= + +-__CC_COM= $(_UNIQ)$(CC) +-___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF)) +-CC_COM= $(___CC_COM:$(_UNIQ)%=%) +- +-__CC++_COM= $(_UNIQ)$(CCC) +-___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF)) +-CC++_COM= $(___CC++_COM:$(_UNIQ)%=%) +- +-CC_COM_DEF= gcc +-CC++_COM_DEF= g++ +-CC= $(CC_COM_DEF) +-CCC= $(CC++_COM_DEF) +- +-CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM) +-CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) +-LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) +-LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) +-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) +-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) ++CC_COM= $(CC) ++CC++_COM= $(CXX) ++ ++CCCC = $(CC_COM) ++CC++ = $(CC++_COM) ++LDCC= $(CC_COM) ++LDCC++ = $(CC++_COM) ++DYNLD= $(CC_COM) ++DYNLDC++ = $(CC++_COM) + + RMDEP= : +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) -M ++MKDEP= $(CC_COM) -M + MKDEP_OUT= +-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) -M ++MKC++DEP= $(CC++_COM) -M + MKC++DEP_OUT= Copied: head/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 (from r363316, head/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1) @@ -0,0 +1,10 @@ +--- btcflash/btcflash.1.orig Wed Feb 8 23:13:24 2006 ++++ btcflash/btcflash.1 Thu Feb 16 14:54:32 2006 +@@ -293,7 +293,6 @@ + login shell. + .SH "SEE ALSO" + .BR cdrecord (1), +-.BR scg (7), + .BR rcmd (3), + .BR ssh (1). + .SH NOTES Copied: head/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi (from r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi) @@ -0,0 +1,36 @@ +--- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003 ++++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003 +@@ -18,24 +18,21 @@ + NOTE: In this case, rscsi must be installed suid root. + **** This is the preferred method **** + +-To enable remote SCSI via the login shell method you should do the following: +- +- - Add an entry to /etc/passwd in the form: ++ The FreeBSD port automatically installs the rscsi binary suid ++ root and creates the user "rscsi". + +- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi +- +- (modify this according to your OS). And don't forget to +- modify /etc/shadow the way it needs to be on your OS. ++To enable remote SCSI via the login shell method you should do the following: + +- - Create a home directory for this user and add a .rhosts file +- to allow access to all users you like. ++ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf ++ and inetd(8) is running. + +- - Install rscsi suid root into /opt/schily/sbin ++ - Edit /usr/local/rscsi/.rhosts to allow access to all users you ++ like. + +- - Install a file /etc/default/rscsi and define access rights. ++ - Edit /usr/local/etc/rscsi and define access rights. + Without this file, rscsi will not work at all. + +- The template for this file is: rscsi/rscsi.dfl ++ The template for this file is: /usr/local/etc/rscsi.sample + + RSCSI Security: + Copied: head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 (from r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1) @@ -0,0 +1,28 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003 ++++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003 +@@ -1738,8 +1738,6 @@ + .SH SEE ALSO + .BR cdda2wav (1), + .BR readcd (1), +-.BR scg (7), +-.BR fbk (7), + .BR mkisofs (8), + .BR rcmd (3), + .BR ssh (1). Copied: head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl (from r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl) @@ -0,0 +1,64 @@ +--- cdrecord/cdrecord.dfl.orig Mon Aug 18 19:45:45 2003 ++++ cdrecord/cdrecord.dfl Mon Aug 18 19:46:32 2003 +@@ -3,7 +3,7 @@ + # This file is /etc/default/cdrecord + # It contains defaults that are used if no command line option + # or environment is present. +-# ++# + # The default device, if not specified elswhere + # Note that since Sommer 2006, cdrecord by default searches for a + # single CD-ROM device. You should set CDR_DEVICE= together with +@@ -11,15 +11,14 @@ + # one CR-ROM drive in your system. + # + #CDR_DEVICE=yamaha +-#CDR_DEVICE=default + +-# ++# + # The default speed (speed=), if not specified elswhere + # + # Note that newer cdrecord versions do not default + # to speed=1. For MMC compliant drives, the default + # is to write at maximum speed, so it in general does +-# not make sense to set up a default speed in /etc/default/cdrecord ++# not make sense to set up a default speed in /etc/default/cdrecord + # + #CDR_SPEED=40 + +@@ -34,7 +33,7 @@ + # Linux and Solaris have problems with bigger transfer sizes. + # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k + # +-#CDR_TRANSFERSIZE=32k ++CDR_TRANSFERSIZE=126k + + # + # The following definitions allow abstract device names. +@@ -56,14 +55,14 @@ + # + # drive name device speed fifosize driveropts transfersize + # +-my-default= 1,0,0 -1 -1 burnfree 63k +-sol-default= USCSI:1,0,0 -1 -1 burnfree +-ricoh-u= USCSI:0,2,0 -1 -1 burnfree +-teac= 1,3,0 -1 -1 "" +-teac-max-ts= 1,3,0 -1 -1 "" 32k +-panasonic= 1,4,0 -1 -1 "" +-plextor= 1,4,0 -1 -1 "" +-sanyo= 1,4,0 -1 -1 burnfree +-yamaha= 1,5,0 -1 -1 "" +-cdrom= 0,6,0 2 1m "" +-remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree ++#my-default= 1,0,0 -1 -1 burnfree 63k ++#sol-default= USCSI:1,0,0 -1 -1 burnfree ++#ricoh-u= USCSI:0,2,0 -1 -1 burnfree ++#teac= 1,3,0 -1 -1 "" ++#teac-max-ts= 1,3,0 -1 -1 "" 32k ++#panasonic= 1,4,0 -1 -1 "" ++#plextor= 1,4,0 -1 -1 "" ++#sanyo= 1,4,0 -1 -1 burnfree ++#yamaha= 1,5,0 -1 -1 "" ++#cdrom= 0,6,0 2 1m "" ++#remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree Copied: head/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h (from r363316, head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h) @@ -0,0 +1,15 @@ +--- include/schily/sha2.h.orig 2010-08-27 12:41:30.000000000 +0200 ++++ include/schily/sha2.h 2012-10-20 14:39:42.000000000 +0200 +@@ -104,10 +104,12 @@ + + #ifdef HAVE_LONGLONG + extern void SHA384Init __PR((SHA2_CTX *)); ++#ifndef HAVE_PRAGMA_WEAK + extern void SHA384Transform __PR((UInt64_t state[8], + const UInt8_t [SHA384_BLOCK_LENGTH])); + extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); + extern void SHA384Pad __PR((SHA2_CTX *)); ++#endif + extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], + SHA2_CTX *)); + extern char *SHA384End __PR((SHA2_CTX *, char *)); Copied: head/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 (from r363316, head/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8) @@ -0,0 +1,20 @@ +--- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003 ++++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003 +@@ -1668,7 +1668,7 @@ + The format of the + .I magic + file is almost identical to the +-.BR magic (4) ++.BR magic (5) + file used by the Linux + .BR file (1) + command - the routines for reading and decoding the +@@ -1707,7 +1707,7 @@ + .TE + .PP + The format of the file is described in the +-.BR magic (4) ++.BR magic (5) + man page. The only difference here is that for each entry in the magic file, the + .I message + for the initial offset Copied: head/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 (from r363316, head/sysutils/cdrtools-devel/files/patch-readcd::readcd.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-readcd::readcd.1) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 ++++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 +@@ -432,9 +432,7 @@ + .SH FILES + .SH SEE ALSO + .BR cdrecord (1), +-.BR mkisofs (1), +-.BR scg (7), +-.BR fbk (7), ++.BR mkisofs (8), + .BR rcmd (3), + .BR ssh (1). + Copied: head/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl (from r363316, head/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl) @@ -0,0 +1,19 @@ +--- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003 ++++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003 +@@ -18,14 +18,13 @@ + # Each USER= entry adds the listed user to the users who may run rscsi + # + # A typical passwd entry looks like this: +-# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi ++# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi + # +-# Add entries for all valid remote users to /export/home/rscsi/.rhosts ++# Add entries for all valid remote users to /usr/local/rscsi/.rhosts + # + # USER= entries are checked with a pattern matcher. USER=* matches all users. + # + USER=rscsi +-#USER=joerg + + # + # Each ACCESS= entry adds a target or group of targets to the list of visible Copied: head/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 (from r363316, head/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1) @@ -0,0 +1,29 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003 ++++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003 +@@ -234,8 +234,7 @@ + .SH SEE ALSO + .BR cdrecord (1), + .BR readcd (1), +-.BR mkisofs (1), +-.BR scg (7). ++.BR mkisofs (8). + + .SH NOTES + .PP Copied: head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul (from r363316, head/sysutils/cdrtools/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-ad) @@ -0,0 +1,68 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 ++++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 +@@ -20,8 +20,9 @@ + ########################################################################### + + CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) +-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) +-C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) ++XCFLAGS:= $(CFLAGS) ++CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) ++C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(XCFLAGS) $(G++OPTOPT) $(C++OPTX) + + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) + COPTS= +@@ -29,12 +30,10 @@ + CWOPTS= -Wall -Wtraditional + CWOPTS= -Wall -Wno-unknown-pragmas \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +-COPTOPT= -O + COPTDYN= -fpic + COPTGPROF= -pg + C++OPTS= + C++WOPTS= $(CWOPTS) +-C++OPTOPT= $(COPTOPT) + C++OPTDYN= -fpic + C++OPTGPROF= -pg + +@@ -54,15 +53,15 @@ + + FLOAT_OPTIONS= + +-CC= @echo " ==> COMPILING \"$@\""; gcc +-CC++ = @echo " ==> COMPILING \"$@\""; g++ +-LDCC= @echo " ==> LINKING \"$@\""; gcc +-LDCC++ = @echo " ==> LINKING \"$@\""; g++ +-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; g++ ++CC_COM= $(CC) ++CC++ = $(CXX) ++LDCC= $(CC) ++LDCC++ = $(CXX) ++DYNLD= $(CC) ++DYNLDC++ = $(CXX) + + RMDEP= : +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M ++MKDEP= $(CC) -M + MKDEP_OUT= +-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M ++MKC++DEP= $(CXX) -M + MKC++DEP_OUT= Copied: head/sysutils/cdrtools/files/patch-btcflash__btcflash.1 (from r363316, head/sysutils/cdrtools/files/patch-btcflash::btcflash.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-btcflash__btcflash.1 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-btcflash::btcflash.1) @@ -0,0 +1,10 @@ +--- btcflash/btcflash.1.orig Wed Feb 8 23:13:24 2006 ++++ btcflash/btcflash.1 Thu Feb 16 14:54:32 2006 +@@ -293,7 +293,6 @@ + login shell. + .SH "SEE ALSO" + .BR cdrecord (1), +-.BR scg (7), + .BR rcmd (3), + .BR ssh (1). + .SH NOTES Copied: head/sysutils/cdrtools/files/patch-cdrecord__README.rscsi (from r363316, head/sysutils/cdrtools/files/patch-cdrecord::README.rscsi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-cdrecord__README.rscsi Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-cdrecord::README.rscsi) @@ -0,0 +1,36 @@ +--- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003 ++++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003 +@@ -18,24 +18,21 @@ + NOTE: In this case, rscsi must be installed suid root. + **** This is the preferred method **** + +-To enable remote SCSI via the login shell method you should do the following: +- +- - Add an entry to /etc/passwd in the form: ++ The FreeBSD port automatically installs the rscsi binary suid ++ root and creates the user "rscsi". + +- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi +- +- (modify this according to your OS). And don't forget to +- modify /etc/shadow the way it needs to be on your OS. ++To enable remote SCSI via the login shell method you should do the following: + +- - Create a home directory for this user and add a .rhosts file +- to allow access to all users you like. ++ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf ++ and inetd(8) is running. + +- - Install rscsi suid root into /opt/schily/sbin ++ - Edit /usr/local/rscsi/.rhosts to allow access to all users you ++ like. + +- - Install a file /etc/default/rscsi and define access rights. ++ - Edit /usr/local/etc/rscsi and define access rights. + Without this file, rscsi will not work at all. + +- The template for this file is: rscsi/rscsi.dfl ++ The template for this file is: /usr/local/etc/rscsi.sample + + RSCSI Security: + Copied: head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 (from r363316, head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1) @@ -0,0 +1,28 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003 ++++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003 +@@ -1738,8 +1738,6 @@ + .SH SEE ALSO + .BR cdda2wav (1), + .BR readcd (1), +-.BR scg (7), +-.BR fbk (7), + .BR mkisofs (8), + .BR rcmd (3), + .BR ssh (1). Copied: head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl (from r363316, head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl) @@ -0,0 +1,64 @@ +--- cdrecord/cdrecord.dfl.orig Mon Aug 18 19:45:45 2003 ++++ cdrecord/cdrecord.dfl Mon Aug 18 19:46:32 2003 +@@ -3,7 +3,7 @@ + # This file is /etc/default/cdrecord + # It contains defaults that are used if no command line option + # or environment is present. +-# ++# + # The default device, if not specified elswhere + # Note that since Sommer 2006, cdrecord by default searches for a + # single CD-ROM device. You should set CDR_DEVICE= together with +@@ -11,15 +11,14 @@ + # one CR-ROM drive in your system. + # + #CDR_DEVICE=yamaha +-#CDR_DEVICE=default + +-# ++# + # The default speed (speed=), if not specified elswhere + # + # Note that newer cdrecord versions do not default + # to speed=1. For MMC compliant drives, the default + # is to write at maximum speed, so it in general does +-# not make sense to set up a default speed in /etc/default/cdrecord ++# not make sense to set up a default speed in /etc/default/cdrecord + # + #CDR_SPEED=40 + +@@ -34,7 +33,7 @@ + # Linux and Solaris have problems with bigger transfer sizes. + # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k + # +-#CDR_TRANSFERSIZE=32k ++CDR_TRANSFERSIZE=126k + + # + # The following definitions allow abstract device names. +@@ -56,14 +55,14 @@ + # + # drive name device speed fifosize driveropts transfersize + # +-my-default= 1,0,0 -1 -1 burnfree 63k +-sol-default= USCSI:1,0,0 -1 -1 burnfree +-ricoh-u= USCSI:0,2,0 -1 -1 burnfree +-teac= 1,3,0 -1 -1 "" +-teac-max-ts= 1,3,0 -1 -1 "" 32k +-panasonic= 1,4,0 -1 -1 "" +-plextor= 1,4,0 -1 -1 "" +-sanyo= 1,4,0 -1 -1 burnfree +-yamaha= 1,5,0 -1 -1 "" +-cdrom= 0,6,0 2 1m "" +-remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree ++#my-default= 1,0,0 -1 -1 burnfree 63k ++#sol-default= USCSI:1,0,0 -1 -1 burnfree ++#ricoh-u= USCSI:0,2,0 -1 -1 burnfree ++#teac= 1,3,0 -1 -1 "" ++#teac-max-ts= 1,3,0 -1 -1 "" 32k ++#panasonic= 1,4,0 -1 -1 "" ++#plextor= 1,4,0 -1 -1 "" ++#sanyo= 1,4,0 -1 -1 burnfree ++#yamaha= 1,5,0 -1 -1 "" ++#cdrom= 0,6,0 2 1m "" ++#remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree Copied: head/sysutils/cdrtools/files/patch-include__schily__sha2.h (from r363316, head/sysutils/cdrtools/files/patch-include::schily::sha2.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-include__schily__sha2.h Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-include::schily::sha2.h) @@ -0,0 +1,14 @@ +--- include/schily/sha2.h.orig 2009-08-09 14:29:59.000000000 +0200 ++++ include/schily/sha2.h 2012-10-20 14:25:05.000000000 +0200 +@@ -102,9 +102,11 @@ + + #ifdef HAVE_LONGLONG + extern void SHA384Init __PR((SHA2_CTX *)); ++#ifndef HAVE_PRAGMA_WEAK + extern void SHA384Transform __PR((UInt64_t state[8], const UInt8_t [SHA384_BLOCK_LENGTH])); + extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); + extern void SHA384Pad __PR((SHA2_CTX *)); ++#endif + extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], SHA2_CTX *)); + extern char *SHA384End __PR((SHA2_CTX *, char *)); + extern char *SHA384File __PR((const char *, char *)); Copied: head/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 (from r363316, head/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8) @@ -0,0 +1,20 @@ +--- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003 ++++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003 +@@ -1668,7 +1668,7 @@ + The format of the + .I magic + file is almost identical to the +-.BR magic (4) ++.BR magic (5) + file used by the Linux + .BR file (1) + command - the routines for reading and decoding the +@@ -1707,7 +1707,7 @@ + .TE + .PP + The format of the file is described in the +-.BR magic (4) ++.BR magic (5) + man page. The only difference here is that for each entry in the magic file, the + .I message + for the initial offset Copied: head/sysutils/cdrtools/files/patch-readcd__readcd.1 (from r363316, head/sysutils/cdrtools/files/patch-readcd::readcd.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-readcd__readcd.1 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-readcd::readcd.1) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 ++++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 +@@ -432,9 +432,7 @@ + .SH FILES + .SH SEE ALSO + .BR cdrecord (1), +-.BR mkisofs (1), +-.BR scg (7), +-.BR fbk (7), ++.BR mkisofs (8), + .BR rcmd (3), + .BR ssh (1). + Copied: head/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl (from r363316, head/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl) @@ -0,0 +1,19 @@ +--- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003 ++++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003 +@@ -18,14 +18,13 @@ + # Each USER= entry adds the listed user to the users who may run rscsi + # + # A typical passwd entry looks like this: +-# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi ++# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi + # +-# Add entries for all valid remote users to /export/home/rscsi/.rhosts ++# Add entries for all valid remote users to /usr/local/rscsi/.rhosts + # + # USER= entries are checked with a pattern matcher. USER=* matches all users. + # + USER=rscsi +-#USER=joerg + + # + # Each ACCESS= entry adds a target or group of targets to the list of visible Copied: head/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 (from r363316, head/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 Tue Jul 29 15:00:12 2014 (r363335, copy of r363316, head/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1) @@ -0,0 +1,29 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003 ++++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003 +@@ -234,8 +234,7 @@ + .SH SEE ALSO + .BR cdrecord (1), + .BR readcd (1), +-.BR mkisofs (1), *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407291500.s6TF0DaL027509>