Date: Wed, 26 Feb 2003 18:29:38 +0900 (JST) From: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48698: japanese/samba cannot compile on 4-stable and other fixes Message-ID: <200302260929.h1Q9Tckg090941@boggy.acest.tutrp.tut.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 48698 >Category: ports >Synopsis: japanese/samba cannot compile on 4-stable and other fixes >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 26 01:30:10 PST 2003 >Closed-Date: >Last-Modified: >Originator: NAKAJI Hiroyuki >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD boggy.acest.tutrp.tut.ac.jp 5.0-CURRENT FreeBSD 5.0-CURRENT #56: Sat Feb 8 14:14:47 JST 2003 root@boggy.acest.tutrp.tut.ac.jp:/usr/obj/usr/src/sys/NAKAJI i386 >Description: Build problem on 4.8-PRERELEASE was reported in FreeBSD-users-jp #73581. http://home.jp.freebsd.org/cgi-bin/showmail/FreeBSD-users-jp/73581 And a solution is provided in ports-jp #13562 http://home.jp.freebsd.org/cgi-bin/showmail/ports-jp/13562 To solve this problem, files/patch-nsswitch:pam_winbind.h is added. Also, in sugj-tech ML of Samba-ja team, some other problems in japanese/samba are indicated by Shirai Takashi that some files/patch-* are unnecessary for samba-2.2.7a-ja-1.0. Files/patch-ak and files/patch-includes.h are to be removed. Note I just checked compile, install and deinstall. For example, it is not checked if winbind can work on FreeBSD or not. >How-To-Repeat: >Fix: Here's a diff. diff -urN -x CVS /usr/ports/japanese/samba/Makefile ./Makefile --- /usr/ports/japanese/samba/Makefile Tue Feb 25 00:15:06 2003 +++ ./Makefile Wed Feb 26 18:25:47 2003 @@ -7,6 +7,7 @@ PORTNAME= samba PORTVERSION= ${SAMBA_VERSION}.j${SAMBA_JA_VERSION} +PORTREVISION= 1 CATEGORIES= japanese net MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \ ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \ diff -urN -x CVS /usr/ports/japanese/samba/files/patch-ak ./files/patch-ak --- /usr/ports/japanese/samba/files/patch-ak Thu Mar 28 01:06:37 2002 +++ ./files/patch-ak Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- script/installswat.sh.orig Thu Jan 31 16:56:23 2002 -+++ script/installswat.sh Wed Feb 20 15:36:18 2002 -@@ -10,7 +10,7 @@ - - for d in $SWATDIR $SWATDIR/help $SWATDIR/images $SWATDIR/include; do - if [ ! -d $d ]; then -- mkdir $d -+ mkdir -p $d - if [ ! -d $d ]; then - echo Failed to make directory $d, does $USER have privileges? - exit 1 -@@ -69,7 +69,7 @@ - - for d in $BOOKDIR $BOOKDIR/figs $BOOKDIR/gifs; do - if [ ! -d $d ]; then -- mkdir $d -+ mkdir -p $d - if [ ! -d $d ]; then - echo Failed to make directory $d, does $USER have privileges? - exit 1 diff -urN -x CVS /usr/ports/japanese/samba/files/patch-ba ./files/patch-ba --- /usr/ports/japanese/samba/files/patch-ba Tue Feb 25 00:15:06 2003 +++ ./files/patch-ba Wed Feb 26 17:33:29 2003 @@ -1,40 +1,15 @@ ---- configure.in.orig Mon Dec 16 12:00:04 2002 -+++ configure.in Mon Dec 16 22:56:30 2002 -@@ -510,9 +510,23 @@ - ############################################ - # we need dlopen/dlclose/dlsym/dlerror for PAM, the password database plugins and the new VFS code - AC_CHECK_FUNCS(dlopen) -+case "$host_os" in -+ *bsd*) -+ AC_CHECK_LIB(c, dlopen, [LIBS="$LIBS -lc"; -+ AC_DEFINE(HAVE_DLOPEN)]) -+ ;; -+esac - if test x"$ac_cv_func_dlopen" = x"no"; then -- AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl"; -- AC_DEFINE(HAVE_DLOPEN)]) -+ case "$host_os" in -+ *bsd*) -+ AC_CHECK_LIB(c, dlopen, [LIBS="$LIBS -lc"; -+ AC_DEFINE(HAVE_DLOPEN)]) -+ ;; -+ *) -+ AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl"; -+ AC_DEFINE(HAVE_DLOPEN)]) -+ ;; -+ esac - fi - # dlopen/dlclose/dlsym/dlerror will be checked again later and defines will be set then +--- configure.in.orig Wed Feb 26 17:32:32 2003 ++++ configure.in Wed Feb 26 17:33:13 2003 +@@ -170,7 +170,7 @@ + AC_SUBST(INSTALLCLIENTLIB) -@@ -972,6 +986,7 @@ - *osf*) AC_DEFINE(OSF1) - BLDSHARED="true" - LDSHFLAGS="-shared" -+ DYNEXP="-Wl,--export-dynamic" - SONAMEFLAG="-Wl,-soname," - PICFLAG="-fPIC" - AC_DEFINE(STAT_ST_BLOCKSIZE,512) -@@ -1981,7 +1996,7 @@ + # compile with optimization and without debugging by default +-CFLAGS="-O ${CFLAGS}" ++CFLAGS="${CFLAGS}" + + AC_ARG_ENABLE(debug, + [ --enable-debug Turn on compiler debugging information (default=no)], +@@ -1981,7 +1981,7 @@ yes) AC_MSG_RESULT(yes) AC_DEFINE(KRB5_AUTH) diff -urN -x CVS /usr/ports/japanese/samba/files/patch-includes.h ./files/patch-includes.h --- /usr/ports/japanese/samba/files/patch-includes.h Tue Feb 25 00:15:06 2003 +++ ./files/patch-includes.h Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- include/includes.h.orig Tue Dec 10 19:50:18 2002 -+++ include/includes.h Tue Dec 10 19:52:33 2002 -@@ -808,8 +808,10 @@ - #endif - - /* this guess needs to be improved (tridge) */ -+#ifndef FREEBSD - #if (defined(STAT_STATVFS) || defined(STAT_STATVFS64)) && !defined(SYSV) - #define SYSV 1 -+#endif - #endif - - #ifndef DEFAULT_PRINTING diff -urN -x CVS /usr/ports/japanese/samba/files/patch-nsswitch:pam_winbind.h ./files/patch-nsswitch:pam_winbind.h --- /usr/ports/japanese/samba/files/patch-nsswitch:pam_winbind.h Thu Jan 1 09:00:00 1970 +++ ./files/patch-nsswitch:pam_winbind.h Wed Feb 26 14:28:44 2003 @@ -0,0 +1,12 @@ +--- nsswitch/pam_winbind.h.orig Mon Feb 10 17:21:48 2003 ++++ nsswitch/pam_winbind.h Wed Feb 26 14:28:24 2003 +@@ -31,7 +31,9 @@ + #define PAM_EXTERN extern + #include <security/pam_appl.h> + ++#ifndef PAM_AUTHTOK_RECOVER_ERR + #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR ++#endif + #endif + + #ifdef HAVE_SECURITY_PAM_MODULES_H >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302260929.h1Q9Tckg090941>