OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 10-Oct-2003 21:06:44
Branch: HEAD Handle: 2003101020064202
Added files:
openpkg-src/rdist rdist.patch
Modified files:
openpkg-src/rdist rdist.spec
openpkg-web news.txt
Log:
finally port to FreeBSD
Summary:
Revision Changes Path
1.1 +114 -0 openpkg-src/rdist/rdist.patch
1.14 +5 -5 openpkg-src/rdist/rdist.spec
1.6963 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rdist/rdist.patch
============================================================================
$ cvs diff -u -r0 -r1.1 rdist.patch
--- /dev/null 2003-10-10 21:06:44.000000000 +0200
+++ rdist.patch 2003-10-10 21:06:44.000000000 +0200
@@ -0,0 +1,114 @@
+Index: src/common.c
+--- src/common.c.orig 2001-10-22 22:29:22.000000000 +0200
++++ src/common.c 2003-10-10 20:56:44.000000000 +0200
+@@ -143,7 +143,7 @@
+ /*
+ * Set program name
+ */
+-extern void setprogname(argv)
++extern void rdist_setprogname(argv)
+ char **argv;
+ {
+ register char *cp;
+@@ -170,7 +170,7 @@
+ if (!isserver)
+ (void) signal(SIGSEGV, sighandler);
+
+- setprogname(argv);
++ rdist_setprogname(argv);
+
+ /*
+ * Save a copy of our argc and argv before setargs() overwrites them
+Index: src/rdist.c
+--- src/rdist.c.orig 2001-10-22 22:29:22.000000000 +0200
++++ src/rdist.c 2003-10-10 20:56:57.000000000 +0200
+@@ -138,7 +138,7 @@
+ * We initialize progname here instead of init() because
+ * things in msgparseopts() need progname set.
+ */
+- setprogname(argv);
++ rdist_setprogname(argv);
+
+ if (cp = msgparseopts(localmsglist, TRUE)) {
+ error("Bad builtin log option (%s): %s.",
+Index: src/server.c
+--- src/server.c.orig 2001-10-22 22:29:22.000000000 +0200
++++ src/server.c 2003-10-10 20:57:43.000000000 +0200
+@@ -172,7 +172,7 @@
+ /*
+ * Set mode of a file
+ */
+-static int setmode(file, fd, mode, link)
++static int rdist_setmode(file, fd, mode, link)
+ char *file;
+ int fd;
+ int mode;
+@@ -355,7 +355,7 @@
+ mode &= ~S_ISGID;
+ }
+ }
+- (void) setmode(file, fd, mode, S_ISLNK(st.st_mode));
++ (void) rdist_setmode(file, fd, mode, S_ISLNK(st.st_mode));
+
+ return(0);
+ }
+Index: src/filesys-os.c
+--- src/filesys-os.c.orig 2001-10-22 22:29:22.000000000 +0200
++++ src/filesys-os.c 2003-10-10 21:04:52.000000000 +0200
+@@ -211,6 +211,7 @@
+ mntstruct.me_flags |= MEFLAG_READONLY;
+ #endif
+
++#ifdef MOUNT_NFS
+ #if FMT_TYPE == FMT_STATFS_STR && defined(HAVE_GETVFSBYNAME)
+ {
+ /*
+@@ -270,6 +271,16 @@
+ break;
+ }
+ #endif /* FMT_TYPE == FMT_STATFS_STR */
++#else
++ if ((((struct statfs*)mnt)->f_flags & MNT_LOCAL) == 0) {
++ (void) sprintf(remote_dev, "%s", mnt->f_mntfromname);
++ mntstruct.me_path = remote_dev;
++ mntstruct.me_type = METYPE_NFS;
++ } else {
++ mntstruct.me_path = mnt->f_mntonname;
++ mntstruct.me_type = METYPE_OTHER;
++ }
++#endif
+
+ mnt = (struct statfs*)(sizeof(struct statfs)+(ulong)mnt);
+ entries_left--;
+Index: src/relsymlink.c
+--- src/relsymlink.c.orig 2001-10-22 22:29:22.000000000 +0200
++++ src/relsymlink.c 2003-10-10 21:05:12.000000000 +0200
+@@ -76,7 +76,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <sys/param.h>
+ #include "defs.h"
+
+Index: include/defs.h
+--- include/defs.h.orig 2001-10-22 22:21:36.000000000 +0200
++++ include/defs.h 2003-10-10 20:57:12.000000000 +0200
+@@ -333,7 +333,6 @@
+ extern void complain();
+ extern void docmds();
+ extern void finish();
+-extern void log();
+ extern void logmsg();
+ extern void lostconn();
+ extern void markassigned();
+@@ -342,7 +341,7 @@
+ extern void runcmdspecial();
+ extern void runcommand();
+ extern void server();
+-extern void setprogname();
++extern void rdist_setprogname();
+ extern void sighandler();
+ extern void waitup();
+ struct namelist *expand();
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rdist/rdist.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 rdist.spec
--- openpkg-src/rdist/rdist.spec 1 Oct 2003 16:02:05 -0000 1.13
+++ openpkg-src/rdist/rdist.spec 10 Oct 2003 19:06:44 -0000 1.14
@@ -23,8 +23,6 @@
## SUCH DAMAGE.
##
-# FIXME: rse: does not compile under FreeBSD 4!
-
# package versions
%define V_base 7.0.0
%define V_pl alpha10
@@ -36,19 +34,20 @@
URL: http://www.magnicomp.com/rdist/
Vendor: MagniComp
Packager: The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
Group: Filesystem
License: BSD
Version: %{V_opkg}
-Release: 20031001
+Release: 20031010
# package options
%option with_fsl yes
# list of sources
-Source0: ftp://ftp.rge.com/download/rdist/rdist-%{V_base}-%{V_pl}.tar.gz
+Source0: ftp://ftp.rge.com/pub/admin/rdist/rdist-%{V_base}-%{V_pl}.tar.gz
Source1: rc.rdist
Source2: fsl.rdist
+Patch0: rdist.patch
# build information
Prefix: %{l_prefix}
@@ -69,6 +68,7 @@
%prep
%setup -q -n rdist-%{V_base}-%{V_pl}
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6962 -r1.6963 news.txt
--- openpkg-web/news.txt 10 Oct 2003 18:40:52 -0000 1.6962
+++ openpkg-web/news.txt 10 Oct 2003 19:06:42 -0000 1.6963
@@ -1,3 +1,4 @@
+10-Oct-2003: Upgraded package: P<rdist-7.0.0a10-20031010>
10-Oct-2003: Upgraded package: P<nspr-4.3-20031010>
10-Oct-2003: Upgraded package: P<audiofile-0.2.4-20031010>
10-Oct-2003: Upgraded package: P<orbit2-2.8.2-20031010>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
