From owner-p4-projects@FreeBSD.ORG Sun Oct 1 12:16:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E227C16A40F; Sun, 1 Oct 2006 12:16:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B28F16A407 for ; Sun, 1 Oct 2006 12:16:56 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E5AE43D45 for ; Sun, 1 Oct 2006 12:16:56 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91CGuqx011328 for ; Sun, 1 Oct 2006 12:16:56 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91CGtLi011325 for perforce@freebsd.org; Sun, 1 Oct 2006 12:16:55 GMT (envelope-from piso@freebsd.org) Date: Sun, 1 Oct 2006 12:16:55 GMT Message-Id: <200610011216.k91CGtLi011325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 107044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Oct 2006 12:16:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107044 Change 107044 by piso@piso_newluxor on 2006/10/01 12:16:28 Use SHLIBNAME and install libalias modules in /lib as libalias_${NAME}.so: this way natd can correctly load modules before /usr is mounted. Affected files ... .. //depot/projects/soc2005/libalias/etc/libalias.conf#3 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#5 edit Differences ... ==== //depot/projects/soc2005/libalias/etc/libalias.conf#3 (text+ko) ==== @@ -1,8 +1,8 @@ # $FreeBSD: src/etc/libalias.conf,v 1.1 2006/09/26 23:26:48 piso Exp $ -/usr/lib/libalias_cuseeme.so -/usr/lib/libalias_ftp.so -/usr/lib/libalias_irc.so -/usr/lib/libalias_nbt.so -/usr/lib/libalias_pptp.so -/usr/lib/libalias_skinny.so -/usr/lib/libalias_smedia.so +/lib/libalias_cuseeme.so +/lib/libalias_ftp.so +/lib/libalias_irc.so +/lib/libalias_nbt.so +/lib/libalias_pptp.so +/lib/libalias_skinny.so +/lib/libalias_smedia.so ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#6 (text+ko) ==== @@ -3,4 +3,5 @@ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias SHLIBDIR?= /lib +SHLIB_NAME=libalias_${NAME}.so WARNS?= 1 ==== //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= cuseeme LIB= alias_cuseeme SRCS= alias_cuseeme.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= dummy LIB= alias_dummy SRCS= alias_dummy.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= ftp LIB= alias_ftp SRCS= alias_ftp.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= irc LIB= alias_irc SRCS= alias_irc.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= nbt LIB= alias_nbt SRCS= alias_nbt.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= pptp LIB= alias_pptp SRCS= alias_pptp.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +NAME= skinny LIB= alias_skinny SRCS= alias_skinny.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +NAME= smedia LIB= alias_smedia SRCS= alias_smedia.c