[Glibc-bsd-commits] r3817 - in trunk: . freebsd-smbfs freebsd-smbfs/debian freebsd-smbfs/debian/patches freebsd-smbfs/debian/source
Robert Millan
rmh at alioth.debian.org
Sat Nov 5 21:16:13 UTC 2011
Author: rmh
Date: 2011-11-05 21:16:13 +0000 (Sat, 05 Nov 2011)
New Revision: 3817
Added:
trunk/freebsd-smbfs/
trunk/freebsd-smbfs/debian/
trunk/freebsd-smbfs/debian/changelog
trunk/freebsd-smbfs/debian/compat
trunk/freebsd-smbfs/debian/control
trunk/freebsd-smbfs/debian/copyright
trunk/freebsd-smbfs/debian/freebsd-smbfs.install
trunk/freebsd-smbfs/debian/freebsd-smbfs.manpages
trunk/freebsd-smbfs/debian/patches/
trunk/freebsd-smbfs/debian/patches/af_netbios.diff
trunk/freebsd-smbfs/debian/patches/config_file.diff
trunk/freebsd-smbfs/debian/patches/getvfsbyname.diff
trunk/freebsd-smbfs/debian/patches/makefile.diff
trunk/freebsd-smbfs/debian/patches/series
trunk/freebsd-smbfs/debian/rules
trunk/freebsd-smbfs/debian/source/
trunk/freebsd-smbfs/debian/source/format
Log:
New package freebsd-smbfs
Added: trunk/freebsd-smbfs/debian/changelog
===================================================================
--- trunk/freebsd-smbfs/debian/changelog (rev 0)
+++ trunk/freebsd-smbfs/debian/changelog 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,5 @@
+freebsd-smbfs (9.0~svn227117-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Robert Millan <rmh at debian.org> Sat, 05 Nov 2011 20:43:26 +0100
Added: trunk/freebsd-smbfs/debian/compat
===================================================================
--- trunk/freebsd-smbfs/debian/compat (rev 0)
+++ trunk/freebsd-smbfs/debian/compat 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1 @@
+7
Added: trunk/freebsd-smbfs/debian/control
===================================================================
--- trunk/freebsd-smbfs/debian/control (rev 0)
+++ trunk/freebsd-smbfs/debian/control 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,18 @@
+Source: freebsd-smbfs
+Section: otherosfs
+Priority: optional
+Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
+Uploaders: Robert Millan <rmh at debian.org>
+Build-Depends: debhelper (>= 7.0.50~),
+ freebsd-buildutils,
+ kfreebsd-kernel-headers (>= 0.59),
+ libkiconv-dev,
+Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-smbfs/
+Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-smbfs/
+Standards-Version: 3.9.2
+
+Package: freebsd-smbfs
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: mount command for the SMB/CIFS filesystem
+ This is native SMB/CIFS filesystem (smbfs for short) for GNU/kFreeBSD.
Added: trunk/freebsd-smbfs/debian/copyright
===================================================================
--- trunk/freebsd-smbfs/debian/copyright (rev 0)
+++ trunk/freebsd-smbfs/debian/copyright 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,56 @@
+Name: SMB/CIFS filesystem for FreeBSD
+Author: Boris Popov <bp at freebsd.org>
+
+Files: *
+Copyright: 2000, 2001, Boris Popov
+License:
+ 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 Boris Popov.
+ 4. Neither the name of the author nor the names of any co-contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+
+Files: debian/*
+Copyright: 2011, Robert Millan <rmh at debian.org>
+License:
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY AUTHOR 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 AUTHOR 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-smbfs/debian/freebsd-smbfs.install
===================================================================
--- trunk/freebsd-smbfs/debian/freebsd-smbfs.install (rev 0)
+++ trunk/freebsd-smbfs/debian/freebsd-smbfs.install 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,2 @@
+usr.sbin/mount_smbfs/mount_smbfs usr/sbin
+etc/nsmb.conf etc
Added: trunk/freebsd-smbfs/debian/freebsd-smbfs.manpages
===================================================================
--- trunk/freebsd-smbfs/debian/freebsd-smbfs.manpages (rev 0)
+++ trunk/freebsd-smbfs/debian/freebsd-smbfs.manpages 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1 @@
+usr.sbin/mount_smbfs/mount_smbfs.8.gz
Added: trunk/freebsd-smbfs/debian/patches/af_netbios.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/af_netbios.diff (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/af_netbios.diff 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,11 @@
+--- a/contrib/smbfs/lib/smb/nb_name.c
++++ b/contrib/smbfs/lib/smb/nb_name.c
+@@ -61,7 +61,7 @@
+ if (snb == NULL)
+ return ENOMEM;
+ bzero(snb, slen);
+- snb->snb_family = AF_NETBIOS;
++ snb->snb_family = 6;
+ snb->snb_len = slen;
+ *dst = snb;
+ return 0;
Added: trunk/freebsd-smbfs/debian/patches/config_file.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/config_file.diff (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/config_file.diff 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,11 @@
+--- a/contrib/smbfs/include/netsmb/smb_lib.h
++++ b/contrib/smbfs/include/netsmb/smb_lib.h
+@@ -39,7 +39,7 @@
+ #include <netsmb/smb_dev.h>
+
+ #ifndef SMB_CFG_FILE
+-#define SMB_CFG_FILE "/usr/local/etc/nsmb.conf"
++#define SMB_CFG_FILE "/etc/nsmb.conf"
+ #endif
+
+ #define STDPARAM_ARGS 'A':case 'B':case 'C':case 'E':case 'I': \
Added: trunk/freebsd-smbfs/debian/patches/getvfsbyname.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/getvfsbyname.diff (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/getvfsbyname.diff 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,84 @@
+--- /dev/null
++++ b/usr.sbin/mount_smbfs/getvfsbyname.c
+@@ -0,0 +1,70 @@
++/*
++ * Copyright (c) 1995
++ * The Regents of the University of California. All rights reserved.
++ *
++ * 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.
++ * 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.
++ */
++
++#include <stddef.h>
++#include <sys/mount.h>
++#include <sys/sysctl.h>
++#include <errno.h>
++#include <stdlib.h>
++#include <string.h>
++
++/*
++ * Given a filesystem name, determine if it is resident in the kernel,
++ * and if it is resident, return its xvfsconf structure.
++ */
++int
++getvfsbyname(fsname, vfcp)
++ const char *fsname;
++ struct xvfsconf *vfcp;
++{
++ struct xvfsconf *xvfsp;
++ size_t buflen;
++ int cnt, i;
++
++ if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0)
++ return (-1);
++ xvfsp = malloc(buflen);
++ if (xvfsp == NULL)
++ return (-1);
++ if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) {
++ free(xvfsp);
++ return (-1);
++ }
++ cnt = buflen / sizeof(struct xvfsconf);
++ for (i = 0; i < cnt; i++) {
++ if (strcmp(fsname, xvfsp[i].vfc_name) == 0) {
++ memcpy(vfcp, xvfsp + i, sizeof(struct xvfsconf));
++ free(xvfsp);
++ return (0);
++ }
++ }
++ free(xvfsp);
++ errno = ENOENT;
++ return (-1);
++}
+--- a/usr.sbin/mount_smbfs/Makefile
++++ b/usr.sbin/mount_smbfs/Makefile
+@@ -1,7 +1,7 @@
+ # $FreeBSD$
+
+ PROG= mount_smbfs
+-SRCS= mount_smbfs.c getmntopts.c
++SRCS= mount_smbfs.c getmntopts.c getvfsbyname.c
+ MAN= mount_smbfs.8
+
+ MOUNTDIR= ${.CURDIR}/../../sbin/mount
Added: trunk/freebsd-smbfs/debian/patches/makefile.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/makefile.diff (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/makefile.diff 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,11 @@
+--- a/usr.sbin/mount_smbfs/Makefile
++++ b/usr.sbin/mount_smbfs/Makefile
+@@ -8,7 +8,7 @@
+ CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
+ CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include
+
+-LDADD= -lsmb -lkiconv
++LDADD= ../../lib/libsmb/libsmb.a -lkiconv -ldl
+ DPADD= ${LIBSMB} ${LIBKICONV}
+
+ # Needs to be dynamically linked for optional dlopen() access to
Added: trunk/freebsd-smbfs/debian/patches/series
===================================================================
--- trunk/freebsd-smbfs/debian/patches/series (rev 0)
+++ trunk/freebsd-smbfs/debian/patches/series 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,4 @@
+af_netbios.diff
+makefile.diff
+getvfsbyname.diff
+config_file.diff
Added: trunk/freebsd-smbfs/debian/rules
===================================================================
--- trunk/freebsd-smbfs/debian/rules (rev 0)
+++ trunk/freebsd-smbfs/debian/rules 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1,118 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+SHELL=bash
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+CFLAGS = -Wall -Wno-unknown-pragmas -g -pipe -fPIC -I. \
+ -D_GNU_SOURCE -D'__FBSDID(string)=' \
+ -D__va_list=__builtin_va_list
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+full_version := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+tar_version := $(shell echo $(full_version) | sed -e 's/-.*//g')
+svn_revision := $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g')
+version := $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
+major := $(shell echo $(version) | sed -e 's/\..*//g')
+revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
+
+#SVN := http://svn.freebsd.org/base/release/$(version).0
+#SVN := http://svn.freebsd.org/base/releng/$(version)
+SVN := http://svn.freebsd.org/base/stable/$(major)
+#SVN := http://svn.freebsd.org/base/head
+
+SOURCE = freebsd-smbfs
+ORIGDIR = $(SOURCE)-$(tar_version)
+TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
+
+PATH := /usr/lib/freebsd:$(PATH)
+DESTDIR = $(CURDIR)/debian/tmp
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
+ NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+
+get-orig-source:
+ rm -rf $(ORIGDIR)
+ mkdir -p $(ORIGDIR)/etc
+ for i in \
+ contrib/smbfs \
+ usr.sbin/mount_smbfs \
+ lib/libsmb \
+ sbin/mount \
+ etc/nsmb.conf \
+ ; do \
+ svn export $(SVN)/$$i -r $(svn_revision) $(ORIGDIR)/$$i ; \
+ done
+ tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
+ rm -rf $(ORIGDIR)
+
+build: build-arch build-indep
+
+build-arch: build-libsmb build-smbfs
+
+build-indep:
+# We have nothing to do by default.
+
+
+build-libsmb: build-libsmb-stamp
+build-libsmb-stamp:
+ $(PMAKE) -C $(CURDIR)/lib/libsmb
+ touch $@
+
+build-smbfs: build-smbfs-stamp
+build-smbfs-stamp: build-libsmb-stamp
+ $(PMAKE) -C $(CURDIR)/usr.sbin/mount_smbfs
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+
+ $(PMAKE) -C $(CURDIR)/usr.sbin/mount_smbfs clean
+
+ rm -f *stamp
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep -s
+ dh_installdirs -s
+ dh_install -s
+
+
+binary: binary-arch binary-indep
+
+binary-indep: build install
+# We have nothing to do by default.
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -s
+ dh_installdocs -s
+# dh_installexamples
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link -s
+ dh_strip -s
+ dh_compress -s
+ dh_fixperms -s
+ dh_makeshlibs -s
+ dh_installdeb -s
+ dh_shlibdeps -s
+ dh_gencontrol -s
+ dh_md5sums -s
+ dh_builddeb -s
+
+.PHONY: build clean binary-indep binary-arch binary install configure build-arch build-indep
Property changes on: trunk/freebsd-smbfs/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/freebsd-smbfs/debian/source/format
===================================================================
--- trunk/freebsd-smbfs/debian/source/format (rev 0)
+++ trunk/freebsd-smbfs/debian/source/format 2011-11-05 21:16:13 UTC (rev 3817)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Glibc-bsd-commits
mailing list