[Glibc-bsd-commits] r3281 - in trunk/freebsd-quota/debian: . patches source
Mats Erik Andersson
meand-guest at alioth.debian.org
Mon Feb 28 21:20:25 UTC 2011
Author: meand-guest
Date: 2011-02-28 21:20:21 +0000 (Mon, 28 Feb 2011)
New Revision: 3281
Added:
trunk/freebsd-quota/debian/README
trunk/freebsd-quota/debian/changelog
trunk/freebsd-quota/debian/compat
trunk/freebsd-quota/debian/control
trunk/freebsd-quota/debian/copyright
trunk/freebsd-quota/debian/freebsd-quota.default
trunk/freebsd-quota/debian/freebsd-quota.init
trunk/freebsd-quota/debian/freebsd-quota.install
trunk/freebsd-quota/debian/freebsd-quota.links
trunk/freebsd-quota/debian/freebsd-quota.lintian-overrides
trunk/freebsd-quota/debian/freebsd-quota.manpages
trunk/freebsd-quota/debian/patches/
trunk/freebsd-quota/debian/patches/01_sbin_quotacheck.diff
trunk/freebsd-quota/debian/patches/02_usr_bin_quota.diff
trunk/freebsd-quota/debian/patches/03_usr_sbin_edquota.diff
trunk/freebsd-quota/debian/patches/04_usr_sbin_repquota.diff
trunk/freebsd-quota/debian/patches/05_libexec_rquotad.diff
trunk/freebsd-quota/debian/patches/06_manpage_quotacheck.diff
trunk/freebsd-quota/debian/patches/series
trunk/freebsd-quota/debian/rules
trunk/freebsd-quota/debian/source/
trunk/freebsd-quota/debian/source/format
trunk/freebsd-quota/debian/watch
Modified:
trunk/freebsd-quota/debian/
Log:
Initial upload of freebsd-quota.
Property changes on: trunk/freebsd-quota/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/freebsd-quota/debian/README
===================================================================
--- trunk/freebsd-quota/debian/README (rev 0)
+++ trunk/freebsd-quota/debian/README 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,7 @@
+freebsd-quota_8.1-1
+
+ The RPC service for quota queries over NFS is
+ present in this package release, but lacking
+ a server Nfsd ported to GNU/kFreeBSD, the
+ functionality can not be checked. This will
+ be attended to at the earliest possible time.
Added: trunk/freebsd-quota/debian/changelog
===================================================================
--- trunk/freebsd-quota/debian/changelog (rev 0)
+++ trunk/freebsd-quota/debian/changelog 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,5 @@
+freebsd-quota (8.1-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #611143)
+
+ -- Mats Erik Andersson <mats.andersson at gisladisker.se> Mon, 28 Feb 2011 18:29:17 +0100
Added: trunk/freebsd-quota/debian/compat
===================================================================
--- trunk/freebsd-quota/debian/compat (rev 0)
+++ trunk/freebsd-quota/debian/compat 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1 @@
+8
Added: trunk/freebsd-quota/debian/control
===================================================================
--- trunk/freebsd-quota/debian/control (rev 0)
+++ trunk/freebsd-quota/debian/control 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,19 @@
+Source: freebsd-quota
+Section: admin
+Priority: optional
+Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
+Uploaders: Mats Erik Andersson <mats.andersson at gisladisker.se>
+Build-Depends: debhelper (>= 8), libbsd-dev, libc0.1-dev (>= 2.10.1) [kfreebsd-any]
+Standards-Version: 3.9.1
+
+Package: freebsd-quota
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14)
+Suggests: portmap
+Description: management of file system quota for UFS
+ The tools needed to handle file system contingents
+ on GNU/kFreeBSD systems are contained here.
+ .
+ The utilities supply all necessary manipulations to
+ set, activate, and change quota in any UFS partition.
+ Quota support must be compiled into the kernel.
Added: trunk/freebsd-quota/debian/copyright
===================================================================
--- trunk/freebsd-quota/debian/copyright (rev 0)
+++ trunk/freebsd-quota/debian/copyright 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,47 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Upstream-Name: FreeBSD source tree
+Upstream-Contact: The FreeBSD Project
+Source: http://ftp.freebsd.org/pub/FreeBSD/releases/
+
+Files: *
+Copyright: 2010, The FreeBSD Project
+License: FreeBSD
+
+Files: debian/*
+Copyright: 2011, Mats Erik Andersson <debian at gisladisker.se>
+License: FreeBSD
+
+License: FreeBSD
+ Copyright (c) 1980, 1990, 1993
+ The Regents of the University of California. All rights reserved.
+ .
+ This code is derived from software contributed to Berkeley by
+ Robert Elz at The University of Melbourne.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
Added: trunk/freebsd-quota/debian/freebsd-quota.default
===================================================================
--- trunk/freebsd-quota/debian/freebsd-quota.default (rev 0)
+++ trunk/freebsd-quota/debian/freebsd-quota.default 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,22 @@
+# This is a shell script fraction.
+
+# Argument to quotacheck(8) at startup time when
+# updating accounting files. The default "-a"
+# updates all file systems indicated in "/etc/fstab".
+# Set empty to disable.
+#
+#QUOTACHECK_OPTIONS="-a"
+
+# Argument to quotaon(8) for kernel activation.
+# The default "-a" turns on quota accounting for
+# all file systems indicated in "/etc/fstab".
+# Set empty to disable.
+#
+#QUOTAON_OPTIONS="-a"
+
+# Argument to quotaoff(8) to stop kernel watching.
+# The default "-a" stops quota checking for all
+# file systems indicated in "/etc/fstab".
+# Set empty to disable.
+#
+#QUOTAOFF_OPTIONS="-a"
Added: trunk/freebsd-quota/debian/freebsd-quota.init
===================================================================
--- trunk/freebsd-quota/debian/freebsd-quota.init (rev 0)
+++ trunk/freebsd-quota/debian/freebsd-quota.init 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,98 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: quota freebsd-quota
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: S
+# Default-Stop: 0 6
+# Short-Description: Activate user quota accounting.
+# Description: Update any quota accounting files and
+# active the kernel server for accounting.
+### END INIT INFO
+#
+# Written 2011 by Mats Erik Andersson
+# Licensed using four-clause FreeBSD statement.
+#
+###
+
+PATH=/sbin:/bin
+DESC="user quota management"
+
+DEFAULTFILE=/etc/default/quota
+
+QUOTAON=/sbin/quotaon
+QUOTAOFF=/sbin/quotaoff
+QUOTACHECK=/sbin/quotacheck
+
+# Default values
+QUOTACHECK_OPTIONS="-a"
+QUOTAON_OPTIONS="-a"
+QUOTAOFF_OPTIONS="-a"
+
+# Are we active?
+[ -x "$QUOTACHECK" ] || exit 0
+
+# Possibly override the settings above.
+if [ -r "$DEFAULTFILE" ]; then
+ . $DEFAULTFILE
+fi
+
+# Enable VERBOSE setting and load rcS variables.
+. /lib/init/vars.sh
+
+# Define log_* functions according to LSB.
+. /lib/lsb/init-functions
+
+start_quota()
+{
+ # Recalculate correct accounting status
+ if [ -n "${QUOTACHECK_OPTIONS}" ]
+ then
+ [ "$VERBOSE" = "no" ] || log_action_cont_msg "quotacheck"
+ $QUOTACHECK ${QUOTACHECK_OPTIONS}
+ else
+ log_warning_message "Quota recalculation has been turned off!"
+ fi
+
+ # Activate quota accounting
+ if [ -n "${QUOTAON_OPTIONS}" ]
+ then
+ [ "$VERBOSE" = "no" ] || log_action_cont_msg "quotaon"
+ $QUOTAON ${QUOTAON_OPTIONS}
+ else
+ log_warning_message "Quota accounting has been turned off!"
+ fi
+}
+
+stop_quota()
+{
+ # Deactivate quota accounting
+ [ "$VERBOSE" = "no" ] || log_action_cont_msg "quotaoff"
+ [ -n "${QUOTAOFF_OPTIONS}" ] && $QUOTAOFF ${QUOTAOFF_OPTIONS}
+}
+
+case "$1" in
+ start)
+ log_action_begin_msg "Activating $DESC"
+ start_quota
+ log_action_end_msg 0
+ ;;
+ stop)
+ log_action_begin_msg "Stopping $DESC"
+ stop_quota
+ log_action_end_msg 0
+ ;;
+ restart|force-reload)
+ # Really a senseless thing to do, but still.
+ log_action_begin_msg "Restarting $DESC"
+ stop_quota
+ start_quota
+ log_action_end_msg 0
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
Added: trunk/freebsd-quota/debian/freebsd-quota.install
===================================================================
--- trunk/freebsd-quota/debian/freebsd-quota.install (rev 0)
+++ trunk/freebsd-quota/debian/freebsd-quota.install 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,7 @@
+libexec/rpc.rquotad/rpc.rquotad usr/sbin
+sbin/quotacheck/quotacheck sbin
+usr.bin/quota/quota usr/bin
+usr.sbin/edquota/edquota usr/sbin
+usr.sbin/quotaon/quotaon sbin
+usr.sbin/quotaon/quotaoff sbin
+usr.sbin/repquota/repquota usr/sbin
Added: trunk/freebsd-quota/debian/freebsd-quota.links
===================================================================
--- trunk/freebsd-quota/debian/freebsd-quota.links (rev 0)
+++ trunk/freebsd-quota/debian/freebsd-quota.links 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,3 @@
+sbin/quotaon sbin/quotaoff
+usr/share/man/man8/quotaon.8.gz usr/share/man/man8/quotaoff.8.gz
+usr/share/man/man8/rpc.rquotad.8.gz usr/share/man/man8/rquotad.8.gz
Added: trunk/freebsd-quota/debian/freebsd-quota.lintian-overrides
===================================================================
--- trunk/freebsd-quota/debian/freebsd-quota.lintian-overrides (rev 0)
+++ trunk/freebsd-quota/debian/freebsd-quota.lintian-overrides 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1 @@
+init.d-script-possible-missing-stop /etc/init.d/freebsd-quota 1
Added: trunk/freebsd-quota/debian/freebsd-quota.manpages
===================================================================
--- trunk/freebsd-quota/debian/freebsd-quota.manpages (rev 0)
+++ trunk/freebsd-quota/debian/freebsd-quota.manpages 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,6 @@
+libexec/rpc.rquotad/rpc.rquotad.8
+sbin/quotacheck/quotacheck.8
+usr.bin/quota/quota.1
+usr.sbin/edquota/edquota.8
+usr.sbin/quotaon/quotaon.8
+usr.sbin/repquota/repquota.8
Added: trunk/freebsd-quota/debian/patches/01_sbin_quotacheck.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/01_sbin_quotacheck.diff (rev 0)
+++ trunk/freebsd-quota/debian/patches/01_sbin_quotacheck.diff 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,113 @@
+Description: Adaption of upstream FreeBSD source.
+ Compilation errors found in GNU/kFreeBSD.
+ .
+ Attributes and a compatibility library.
+Author: Mats Erik Andersson <debian at gisladisker.se>
+Forwarded: not-needed
+Last-Update: 2011-01-20
+
+--- freebsd-8.1.orig/sbin/fsck/fsutil.c 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/sbin/fsck/fsutil.c 2011-01-20 19:30:59.000000000 +0100
+@@ -46,6 +46,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <bsd/stdlib.h>
+ #include <string.h>
+
+ #include "fsutil.h"
+@@ -53,7 +54,8 @@
+ static const char *dev = NULL;
+ static int preen = 0;
+
+-static void vmsg(int, const char *, va_list) __printflike(2, 0);
++static void vmsg(int, const char *, va_list)
++ __THROW __attribute__ ((__format__ (__printf__, 2, 0))) __wur;
+
+ void
+ setcdevname(const char *cd, int pr)
+--- freebsd-8.1.orig/sbin/fsck/fsutil.h 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/sbin/fsck/fsutil.h 2011-01-20 19:28:09.000000000 +0100
+@@ -32,9 +32,12 @@
+ */
+
+ void perror(const char *);
+-void pfatal(const char *, ...) __printflike(1, 2);
+-void pwarn(const char *, ...) __printflike(1, 2);
+-void panic(const char *, ...) __dead2 __printflike(1, 2);
++void pfatal(const char *, ...)
++ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
++void pwarn(const char *, ...)
++ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
++void panic(const char *, ...) __attribute__ ((noreturn))
++ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
+ const char *devcheck(const char *);
+ const char *cdevname(void);
+ void setcdevname(const char *, int);
+--- freebsd-8.1.orig/sbin/fsck_ffs/fsck.h 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/sbin/fsck_ffs/fsck.h 2011-01-20 19:28:09.000000000 +0100
+@@ -63,6 +63,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <signal.h>
+
+ #define MAXDUP 10 /* limit on dup blks (per inode) */
+ #define MAXBAD 10 /* limit on bad blks (per inode) */
+@@ -372,7 +373,8 @@
+ struct inostat *inoinfo(ino_t inum);
+ int linkup(ino_t orphan, ino_t parentdir, char *name);
+ int makeentry(ino_t parent, ino_t ino, const char *name);
+-void panic(const char *fmt, ...) __printflike(1, 2);
++void panic(const char *fmt, ...)
++ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
+ void pass1(void);
+ void pass1b(void);
+ int pass1check(struct inodesc *);
+@@ -381,10 +383,12 @@
+ void pass4(void);
+ int pass4check(struct inodesc *);
+ void pass5(void);
+-void pfatal(const char *fmt, ...) __printflike(1, 2);
++void pfatal(const char *fmt, ...)
++ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
+ void pinode(ino_t ino);
+ void propagate(void);
+-void pwarn(const char *fmt, ...) __printflike(1, 2);
++void pwarn(const char *fmt, ...)
++ __THROW __attribute__ ((__format__ (__printf__, 1, 2))) __wur;
+ int readsb(int listerr);
+ int reply(const char *question);
+ void rwerror(const char *mesg, ufs2_daddr_t blk);
+--- freebsd-8.1.orig/sbin/fsck_ffs/fsutil.c 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/sbin/fsck_ffs/fsutil.c 2011-01-20 19:28:09.000000000 +0100
+@@ -59,6 +59,8 @@
+
+ #include "fsck.h"
+
++#define __unused
++
+ static void slowio_start(void);
+ static void slowio_end(void);
+
+--- freebsd-8.1.orig/sbin/fsck_ffs/utilities.c 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/sbin/fsck_ffs/utilities.c 2011-01-20 19:28:09.000000000 +0100
+@@ -55,6 +55,7 @@
+
+ #include "fsck.h"
+
++#define __unused
+
+ char *
+ blockcheck(char *origname)
+--- freebsd-8.1.orig/sbin/quotacheck/Makefile 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/sbin/quotacheck/Makefile 2011-01-20 19:28:09.000000000 +0100
+@@ -6,6 +6,8 @@
+ WARNS?= 2
+ MAN= quotacheck.8
+
++LDADD= -lbsd
++
+ .PATH: ${.CURDIR}/../fsck ${.CURDIR}/../fsck_ffs
+
+ .include <bsd.prog.mk>
Added: trunk/freebsd-quota/debian/patches/02_usr_bin_quota.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/02_usr_bin_quota.diff (rev 0)
+++ trunk/freebsd-quota/debian/patches/02_usr_bin_quota.diff 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,16 @@
+Description: Adaption of upstream FreeBSD source.
+ GNU/kFreeBSD resorts to a compatibility library.
+Author: Mats Erik Andersson <debian at gisladisker.se>
+Forwarded: not-needed
+Last-Update: 2011-01-21
+
+--- freebsd-8.1.orig/usr.bin/quota/Makefile 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/usr.bin/quota/Makefile 2011-01-21 13:54:16.000000000 +0100
+@@ -5,6 +5,6 @@
+ BINOWN= root
+
+ DPADD= ${LIBRPCSVC} ${LIBUTIL}
+-LDADD= -lrpcsvc -lutil
++LDADD= -lrpcsvc -lbsd
+
+ .include <bsd.prog.mk>
Added: trunk/freebsd-quota/debian/patches/03_usr_sbin_edquota.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/03_usr_sbin_edquota.diff (rev 0)
+++ trunk/freebsd-quota/debian/patches/03_usr_sbin_edquota.diff 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,38 @@
+Description: Adaption of upstream FreeBSD source.
+ GNU/kFreeBSD resorts to a compatibility library.
+ .
+ The call mkstemp(3) needs a longer template in Glibc.
+Author: Mats Erik Andersson <debian at gisladisker.se>
+Forwarded: not-needed
+Last-Update: 2011-01-20
+
+--- freebsd-8.1.orig/usr.sbin/edquota/edquota.c 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/usr.sbin/edquota/edquota.c 2011-01-20 19:28:30.000000000 +0100
+@@ -65,6 +65,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <bsd/string.h>
+ #include <unistd.h>
+ #include "pathnames.h"
+
+diff -Naur freebsd-8.1.orig/usr.sbin/edquota/Makefile /tmp/freebsd-8.1/usr.sbin/edquota/Makefile
+--- freebsd-8.1.orig/usr.sbin/edquota/Makefile 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/usr.sbin/edquota/Makefile 2011-01-20 19:28:30.000000000 +0100
+@@ -4,6 +4,8 @@
+ PROG= edquota
+ MAN= edquota.8
+
++LDADD= -lbsd
++
+ WARNS?= 4
+
+ .include <bsd.prog.mk>
+--- freebsd-8.1.orig/usr.sbin/edquota/pathnames.h 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/usr.sbin/edquota/pathnames.h 2011-01-20 19:28:30.000000000 +0100
+@@ -33,4 +33,4 @@
+ #include <paths.h>
+
+ #undef _PATH_TMP
+-#define _PATH_TMP "/tmp/EdP.aXXXXX"
++#define _PATH_TMP "/tmp/EdP.aXXXXXX"
Added: trunk/freebsd-quota/debian/patches/04_usr_sbin_repquota.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/04_usr_sbin_repquota.diff (rev 0)
+++ trunk/freebsd-quota/debian/patches/04_usr_sbin_repquota.diff 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,27 @@
+Description: Adaption of upstream FreeBSD source
+ GNU/kFreeBSD resorts to a compatibility library.
+Author: Mats Erik Andersson <debian at gisladisker.se>
+Forwarded: not-needed
+Last-Update: 2011-01-20
+
+--- freebsd-8.1.orig/usr.sbin/repquota/Makefile 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/usr.sbin/repquota/Makefile 2011-01-20 19:28:35.000000000 +0100
+@@ -4,6 +4,8 @@
+ PROG= repquota
+ MAN= repquota.8
+
++LDADD= -lbsd
++
+ WARNS?= 4
+
+ .include <bsd.prog.mk>
+--- freebsd-8.1.orig/usr.sbin/repquota/repquota.c 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/usr.sbin/repquota/repquota.c 2011-01-20 19:28:35.000000000 +0100
+@@ -58,6 +58,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <bsd/string.h>
+ #include <time.h>
+ #include <unistd.h>
+ #include <utmp.h>
Added: trunk/freebsd-quota/debian/patches/05_libexec_rquotad.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/05_libexec_rquotad.diff (rev 0)
+++ trunk/freebsd-quota/debian/patches/05_libexec_rquotad.diff 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,95 @@
+Description: Adaptions of upstream FreeBSD source.
+ Glibc uses a partly different set of RPC library
+ calls which need to be migrated.
+Author: Mats Erik Andersson <debian at gisladisker.se>
+Forwarded: not-needed
+Last-Update: 2010-01-21
+
+--- freebsd-8.1.orig/libexec/rpc.rquotad/rquotad.c 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/libexec/rpc.rquotad/rquotad.c 2011-01-21 20:08:22.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <ufs/ufs/quota.h>
+ #include <rpc/rpc.h>
+ #include <rpcsvc/rquota.h>
++#include <rpc/pmap_clnt.h> /* pmap_unset() */
+ #include <arpa/inet.h>
+ #include <netdb.h>
+
+@@ -57,7 +58,7 @@
+ {
+
+ (void) sig;
+- (void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
++ (void) pmap_unset(RQUOTAPROG, RQUOTAVERS);
+ exit(0);
+ }
+
+@@ -77,7 +78,7 @@
+ if (!from_inetd) {
+ daemon(0, 0);
+
+- (void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
++ (void) pmap_unset(RQUOTAPROG, RQUOTAVERS);
+
+ (void) signal(SIGINT, cleanup);
+ (void) signal(SIGTERM, cleanup);
+@@ -87,17 +88,14 @@
+ openlog("rpc.rquotad", LOG_CONS|LOG_PID, LOG_DAEMON);
+
+ /* create and register the service */
+- if (from_inetd) {
+- transp = svc_tli_create(0, NULL, NULL, 0, 0);
+- if (transp == NULL) {
+- syslog(LOG_ERR, "couldn't create udp service.");
+- exit(1);
+- }
+- ok = svc_reg(transp, RQUOTAPROG, RQUOTAVERS,
+- rquota_service, NULL);
+- } else
+- ok = svc_create(rquota_service,
+- RQUOTAPROG, RQUOTAVERS, "udp");
++ transp = svcudp_create(from_inetd ? 0 : RPC_ANYSOCK);
++ if (transp == NULL) {
++ syslog(LOG_ERR, "couldn't create udp service.");
++ exit(1);
++ }
++
++ ok = svc_register(transp, RQUOTAPROG, RQUOTAVERS, rquota_service,
++ from_inetd ? 0 : IPPROTO_UDP);
+ if (!ok) {
+ syslog(LOG_ERR,
+ "unable to register (RQUOTAPROG, RQUOTAVERS, %s)",
+@@ -143,7 +141,8 @@
+ struct timeval timev;
+
+ bzero((char *)&getq_args, sizeof(getq_args));
+- if (!svc_getargs(transp, (xdrproc_t)xdr_getquota_args, &getq_args)) {
++ if (!svc_getargs(transp, (xdrproc_t)xdr_getquota_args,
++ (char *) &getq_args)) {
+ svcerr_decode(transp);
+ return;
+ }
+@@ -175,10 +174,12 @@
+ getq_rslt.getquota_rslt_u.gqr_rquota.rq_ftimeleft =
+ dqblk.dqb_itime - timev.tv_sec;
+ }
+- if (!svc_sendreply(transp, (xdrproc_t)xdr_getquota_rslt, &getq_rslt)) {
++ if (!svc_sendreply(transp, (xdrproc_t)xdr_getquota_rslt,
++ (char *) &getq_rslt)) {
+ svcerr_systemerr(transp);
+ }
+- if (!svc_freeargs(transp, (xdrproc_t)xdr_getquota_args, &getq_args)) {
++ if (!svc_freeargs(transp, (xdrproc_t)xdr_getquota_args,
++ (char *) &getq_args)) {
+ syslog(LOG_ERR, "unable to free arguments");
+ exit(1);
+ }
+@@ -193,7 +194,7 @@
+
+ save_errno = errno;
+
+- caller = (struct sockaddr *)svc_getrpccaller(transp)->buf;
++ caller = (struct sockaddr *)svc_getcaller(transp);
+ getnameinfo(caller, caller->sa_len, name, sizeof (name),
+ NULL, 0, NI_NUMERICHOST);
+ errno = save_errno;
Added: trunk/freebsd-quota/debian/patches/06_manpage_quotacheck.diff
===================================================================
--- trunk/freebsd-quota/debian/patches/06_manpage_quotacheck.diff (rev 0)
+++ trunk/freebsd-quota/debian/patches/06_manpage_quotacheck.diff 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,18 @@
+Description: Non-existent macro in manpage.
+ Use an existing macro.
+Author: Mats Erik Andersson <debian at gisladisker.se>
+Forwarded: http://www.freebsd.org/cgi/query-pr.cgi?pr=154215
+X-Patch-Applied: Fixed in HEAD by r205076.
+Last-Update: 2011-01-21
+
+--- freebsd-8.1.orig/sbin/quotacheck/quotacheck.8 2010-06-14 04:09:06.000000000 +0200
++++ freebsd-8.1/sbin/quotacheck/quotacheck.8 2011-01-21 14:22:47.000000000 +0100
+@@ -82,7 +82,7 @@
+ .Xr fsck 8 .
+ This option is deprecated and parallel passes are always run
+ as per
+-.Xf fsck 8.
++.Xr fsck 8 .
+ .It Fl u
+ Only user quotas listed in
+ .Pa /etc/fstab
Added: trunk/freebsd-quota/debian/patches/series
===================================================================
--- trunk/freebsd-quota/debian/patches/series (rev 0)
+++ trunk/freebsd-quota/debian/patches/series 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,6 @@
+01_sbin_quotacheck.diff
+02_usr_bin_quota.diff
+03_usr_sbin_edquota.diff
+04_usr_sbin_repquota.diff
+05_libexec_rquotad.diff
+06_manpage_quotacheck.diff
Added: trunk/freebsd-quota/debian/rules
===================================================================
--- trunk/freebsd-quota/debian/rules (rev 0)
+++ trunk/freebsd-quota/debian/rules 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,52 @@
+#!/usr/bin/make -f
+
+PATH:=/usr/lib/freebsd:$(PATH)
+
+VERSION=$(shell dpkg-parsechangelog | sed -n '/^Version/ {s/.*: //; s/-.*//; p;}')
+SVNLOC="http://svn.freebsd.org/base/release/$(VERSION).0"
+
+DESTDIR=$(CURDIR)/debian/tmp
+ORIGDIR=freebsd-quota-$(VERSION)
+TARNAME=freebsd-quota_$(VERSION).orig.tar.gz
+
+CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D'__RCSID(string)='
+PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+
+get-orig-source:
+ rm -rf $(ORIGDIR)
+ for nn in sbin libexec usr.bin usr.sbin; \
+ do \
+ mkdir -p $(CURDIR)/$(ORIGDIR)/$$nn; \
+ done
+ for nn in sbin/fsck sbin/fsck_ffs sbin/quotacheck \
+ libexec/rpc.rquotad usr.bin/quota \
+ usr.sbin/edquota usr.sbin/quotaon usr.sbin/repquota; \
+ do \
+ svn export $(SVNLOC)/$$nn $(ORIGDIR)/$$nn; \
+ done
+ tar --numeric-owner --owner 0 --group 0 \
+ -czf $(CURDIR)/../$(TARNAME) $(ORIGDIR)
+ rm -rf $(ORIGDIR)
+
+build:
+ $(PMAKE) -C libexec/rpc.rquotad
+ $(PMAKE) -C sbin/quotacheck
+ $(PMAKE) -C usr.bin/quota
+ $(PMAKE) -C usr.sbin/edquota
+ $(PMAKE) -C usr.sbin/quotaon
+ ln -s quotaon usr.sbin/quotaon/quotaoff
+ $(PMAKE) -C usr.sbin/repquota
+
+override_dh_auto_clean:
+ $(PMAKE) -C libexec/rpc.rquotad clean
+ $(PMAKE) -C sbin/quotacheck clean
+ $(PMAKE) -C usr.bin/quota clean
+ $(PMAKE) -C usr.sbin/edquota clean
+ $(PMAKE) -C usr.sbin/quotaon clean
+ $(PMAKE) -C usr.sbin/repquota clean
+
+override_dh_installinit:
+ dh_installinit -- start 13 S . stop 06 0 6 .
+
+%:
+ dh $@
Property changes on: trunk/freebsd-quota/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/freebsd-quota/debian/source/format
===================================================================
--- trunk/freebsd-quota/debian/source/format (rev 0)
+++ trunk/freebsd-quota/debian/source/format 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/freebsd-quota/debian/watch
===================================================================
--- trunk/freebsd-quota/debian/watch (rev 0)
+++ trunk/freebsd-quota/debian/watch 2011-02-28 21:20:21 UTC (rev 3281)
@@ -0,0 +1,5 @@
+version=3
+
+# The source is cherry picked from the FreeBSD project.
+# There is no simple way to find a prepackaged source
+# archive in the repositories of upstream origin.
More information about the Glibc-bsd-commits
mailing list