[gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-libexec/files: rusersd.xinetd rstatd.xinetd walld.xinetd bootpd.initd bootpd.confd freebsd-libexec-7.0-libfallback.patch sprayd.xinetd rquotad.xinetd ftpd.pamd

[Javier Villavicencio (the_paya)]

the_paya    09/01/22 21:02:22

  Modified:             bootpd.initd bootpd.confd ftpd.pamd
  Added:                rusersd.xinetd rstatd.xinetd walld.xinetd
                        freebsd-libexec-7.0-libfallback.patch sprayd.xinetd
                        rquotad.xinetd
  Log:
  Import of the 7.1 ebuilds from gentoo-bsd overlay.
  (Portage version: 2.2_rc23/cvs/FreeBSD i386)

Revision  Changes    Path
1.3                  sys-freebsd/freebsd-libexec/files/bootpd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.initd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.initd?r1=1.2&r2=1.3

Index: bootpd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bootpd.initd	6 Apr 2007 14:59:47 -0000	1.2
+++ bootpd.initd	22 Jan 2009 21:02:22 -0000	1.3
@@ -1,14 +1,13 @@
 #!/sbin/runscript
-# Copyright 2006 Gentoo Foundation
+# Copyright 2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.initd,v 1.2 2007/04/06 14:59:47 uberlord Exp $
 
 depend() {
 	 need net
 }
 
 start() {
-	local bootptab=${BOOTPTAB_FILE:-/etc/bootptab}
+	local bootptab=${bootptab_file:-/etc/bootptab}
 
 	if ! [ -f "${bootptab}" ]; then
 		eerror "Unable to find the bootptab file: ${bootptab}"
@@ -17,7 +16,7 @@
 	fi
 
 	ebegin "Starting BOOTP server"
-	start-stop-daemon --start --exec /usr/libexec/bootpd -- ${BOOTPD_OPTS} ${bootptab}
+	start-stop-daemon --start --exec /usr/libexec/bootpd -- ${bootpd_opts} ${bootptab}
 	eend $?
 }
 



1.2                  sys-freebsd/freebsd-libexec/files/bootpd.confd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.confd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.confd?r1=1.1&r2=1.2

Index: bootpd.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bootpd.confd	20 Nov 2006 14:27:10 -0000	1.1
+++ bootpd.confd	22 Jan 2009 21:02:22 -0000	1.2
@@ -1,9 +1,7 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/files/bootpd.confd,v 1.1 2006/11/20 14:27:10 flameeyes Exp $
-
 # Configuration file for /etc/init.d/bootpd
 
 # Name of the configuration file for bootpd
-# BOOTPTAB_FILE="/etc/bootptab"
+# bootptab_file="/etc/bootptab"
 
 # Options to pass to bootpd. See bootpd(8).
-# BOOTPD_OPTS=""
+# bootpd_opts=""



1.2                  sys-freebsd/freebsd-libexec/files/ftpd.pamd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/ftpd.pamd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/ftpd.pamd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/ftpd.pamd?r1=1.1&r2=1.2

Index: ftpd.pamd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/files/ftpd.pamd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ftpd.pamd	1 Apr 2006 16:43:51 -0000	1.1
+++ ftpd.pamd	22 Jan 2009 21:02:22 -0000	1.2
@@ -1,20 +1,8 @@
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/files/ftpd.pamd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
-#
 # PAM configuration for the "ftpd" service
 #
 
-# auth
-auth		required	pam_nologin.so		no_warn
-auth		sufficient	pam_opie.so		no_warn no_fake_prompts
-auth		requisite	pam_opieaccess.so	no_warn allow_local
-#auth		sufficient	pam_krb5.so		no_warn
-#auth           sufficient      pam_ssh.so		no_warn try_first_pass
-auth		required	pam_unix.so		no_warn try_first_pass
-
-# account
-#account 	required	pam_krb5.so
-account		required	pam_unix.so
+auth		include         system-auth
+account		include         system-auth
+password	include         system-auth
+session		include         system-auth
 
-# session
-session		required	pam_permit.so



1.1                  sys-freebsd/freebsd-libexec/files/rusersd.xinetd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/rusersd.xinetd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/rusersd.xinetd?rev=1.1&content-type=text/plain

Index: rusersd.xinetd
===================================================================
service rusersd
{
        type = rpc
        socket_type = dgram
        protocol = udp
        wait = yes
        user = root
        server = /usr/libexec/rpc.rusersd
        rpc_version = 1-2
        disabled = yes
}



1.1                  sys-freebsd/freebsd-libexec/files/rstatd.xinetd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/rstatd.xinetd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/rstatd.xinetd?rev=1.1&content-type=text/plain

Index: rstatd.xinetd
===================================================================
service rstatd
{
        type = rpc
        socket_type = dgram
        protocol = udp
        wait = yes
        user = root
        server = /usr/libexec/rpc.rstatd
        rpc_version = 1-3
        disabled = yes
}



1.1                  sys-freebsd/freebsd-libexec/files/walld.xinetd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/walld.xinetd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/walld.xinetd?rev=1.1&content-type=text/plain

Index: walld.xinetd
===================================================================
service walld
{
        type = rpc
        socket_type = dgram
        protocol = udp
        wait = yes
        user = root
        server = /usr/libexec/rpc.rwalld
        rpc_version = 1
        disabled = yes
}



1.1                  sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.0-libfallback.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.0-libfallback.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.0-libfallback.patch?rev=1.1&content-type=text/plain

Index: freebsd-libexec-7.0-libfallback.patch
===================================================================
--- rtld-elf/rtld.c.orig	2007-04-07 23:17:00 +0000
+++ rtld-elf/rtld.c	2007-04-23 09:42:32 +0000
@@ -988,6 +988,103 @@
     return NULL;
 }
 
+#define MAX_LIBRARIES_HITS 255
+
+struct fill_library_paths_args {
+    const char  *name;
+    size_t       namelen;
+    char       **libraries;
+    size_t      *count;
+};
+
+static void *
+fill_library_paths(const char *dir, size_t dirlen, void *param)
+{
+    struct fill_library_paths_args *arg;
+    
+    arg = param;
+    if (*(arg->count) > MAX_LIBRARIES_HITS)
+	return (NULL);
+
+    if (*dir == '/' || trust) {
+	arg->libraries[*(arg->count)] = malloc(sizeof(char)*(dirlen + 1 + arg->namelen + 1));
+	strncpy(arg->libraries[*(arg->count)], dir, dirlen);
+	arg->libraries[*(arg->count)][dirlen] = '/';
+	strncpy(arg->libraries[*(arg->count)] + dirlen + 1, arg->name, arg->namelen+1);
+	
+	dbg("  Trying \"%s\"\n", arg->libraries[*(arg->count)]);
+	if (access(arg->libraries[*(arg->count)], F_OK) == 0) {
+	    *(arg->count) += 1;
+	}
+    }
+    return (NULL);
+}
+
+/**
+ * Find all libraries matching xname for the object refobj (if not null), like
+ * find_library but find all the matching libraries in the paths.
+ *
+ * The returned pointer has to be free()'d (as well as the contained strings)
+ * if it's non-NULL.
+ * The end of the array is found when the pointer gets NULL.
+ */
+static char **find_libraries(const char *xname, const Obj_Entry *refobj)
+{
+    char **libraries;
+    size_t libraries_count;
+    struct fill_library_paths_args arg;
+    char *name;
+
+    if (strchr(xname, '/') != NULL) {	/* Hard coded pathname */
+	if (xname[0] != '/' && !trust) {
+	    _rtld_error("Absolute pathname required for shared object \"%s\"",
+	      xname);
+	    return NULL;
+	}
+	libraries = malloc(sizeof(char*)*2);
+	libraries[0] = xstrdup(xname);
+	libraries[1] = NULL;
+	return libraries;
+    }
+
+    if (libmap_disable || (refobj == NULL) ||
+	(name = lm_find(refobj->path, xname)) == NULL)
+	name = (char *)xname;
+
+    dbg(" Searching for \"%s\"", name);
+
+    /* look up at maximum 255 libraries, would be crazy going over that */
+    libraries = malloc(sizeof(char*)*(MAX_LIBRARIES_HITS+1));
+    libraries_count = 0;
+    
+    arg.name = name;
+    arg.namelen = strlen(name);
+    arg.libraries = libraries;
+    arg.count = &libraries_count;
+    
+    path_enumerate(ld_library_path, fill_library_paths, &arg);
+    if(refobj != NULL)
+        path_enumerate(refobj->rpath, fill_library_paths, &arg);
+    path_enumerate(gethints(), fill_library_paths, &arg);
+    path_enumerate(STANDARD_LIBRARY_PATH, fill_library_paths, &arg);
+
+    libraries[libraries_count] = NULL;
+
+    if(libraries_count == 0) {
+        if(refobj != NULL && refobj->path != NULL) {
+            _rtld_error("Shared object \"%s\" not found, required by \"%s\"",
+	       name, basename(refobj->path));
+        } else {
+            _rtld_error("Shared object \"%s\" not found", name);
+        }
+
+	free(libraries);
+	return NULL;
+    }
+
+    return libraries;
+}
+
 /*
  * Given a symbol number in a referencing object, find the corresponding
  * definition of the symbol.  Returns a pointer to the symbol, or NULL if
@@ -1260,7 +1357,29 @@
 	Needed_Entry *needed;
 
 	for (needed = obj->needed;  needed != NULL;  needed = needed->next) {
-	    needed->obj = load_object(obj->strtab + needed->name, obj);
+	    const char *name = obj->strtab + needed->name;
+	    char **paths = find_libraries(name, obj);
+	    char **curpath = paths;
+
+	    needed->obj = NULL;
+    	    if (paths == NULL) {
+	    if (ld_tracing)
+		continue;
+	    else
+		return -1;
+	    }
+
+	    while(*curpath) {
+		if (needed->obj == NULL) {
+		    needed->obj = load_object(*curpath, NULL);
+		    curpath++;
+		    continue;
+		}
+		/* Continue, so that we can free the whole lot */
+		free(*curpath);
+		curpath++;
+	    }
+	    free(paths);
 	    if (needed->obj == NULL && !ld_tracing)
 		return -1;
 	}



1.1                  sys-freebsd/freebsd-libexec/files/sprayd.xinetd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/sprayd.xinetd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/sprayd.xinetd?rev=1.1&content-type=text/plain

Index: sprayd.xinetd
===================================================================
service sprayd
{
        type = rpc
        socket_type = dgram
        protocol = udp
        wait = yes
        user = root
        server = /usr/libexec/rpc.sprayd
        rpc_version = 1
        disabled = yes
}



1.1                  sys-freebsd/freebsd-libexec/files/rquotad.xinetd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/rquotad.xinetd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-libexec/files/rquotad.xinetd?rev=1.1&content-type=text/plain

Index: rquotad.xinetd
===================================================================
service rquotad
{
	type = rpc
	socket_type = dgram
	protocol = udp
	wait = yes
	user = root
	server = /usr/libexec/rpc.rquotad
	rpc_version = 1
	disabled = yes
}