2011年4月28日木曜日

ports の net/samba35 が微妙に古い

このエントリーをブックマークに追加 このエントリーを含むはてなブックマーク
FreeBSD ports に入っている samba 3.5系 (net/samba35) がどういう訳か 3.5.6 のままなのですね。
samba 3.5系の最新版は現在 3.5.8 なわけで。これはよろしくない、ってんで検証を一切していないまま、無理矢理最新版をコンパイルするような patch を作ってみました。
diff -urN net/samba35.orig/Makefile net/samba35/Makefile
--- net/samba35.orig/Makefile 2011-04-11 22:22:12.708685727 +0900
+++ net/samba35/Makefile 2011-04-26 19:28:16.125102303 +0900
@@ -6,8 +6,8 @@
#

PORTNAME= ${SAMBA_BASENAME}35
-PORTVERSION= 3.5.6
-PORTREVISION?= 2
+PORTVERSION= 3.5.8
+PORTREVISION?= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= . old-versions rc pre
@@ -18,8 +18,8 @@

CONFLICTS?= *samba3[0-4]-3.* sharity-light-1.*
# Additional patches from Sernet.de
-PATCH_STRIP= -p1
-EXTRA_PATCHES= ${PATCHDIR}/sernet.patch
+#PATCH_STRIP= -p1
+#EXTRA_PATCHES= ${PATCHDIR}/sernet.patch

LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING
diff -urN net/samba35.orig/distinfo net/samba35/distinfo
--- net/samba35.orig/distinfo 2011-01-13 14:55:07.821352212 +0900
+++ net/samba35/distinfo 2011-04-26 16:52:06.184280759 +0900
@@ -1,2 +1,2 @@
-SHA256 (samba-3.5.6.tar.gz) = 466410868375d19a286ac3fc5d9f3c267ce359189f8e0d76e72ec10bd54247da
-SIZE (samba-3.5.6.tar.gz) = 30803319
+SHA256 (samba-3.5.8.tar.gz) = 331e3f2806edcad853b48f4b1e653367ad9a6ce1ab5ed486c03a6bf614882796
+SIZE (samba-3.5.8.tar.gz) = 30721269
お察しの通り、ほぼ distinfo を更新しただけです。EXTRA PATCHES はバグフィクスされたかどうか分からないので一旦保留にしてあります。
手元でコンパイルしてみると、出るわ出るわwarning...

% uname -mrs
FreeBSD 8.2-RC3 amd64
% grep warning samba358log.txt
configure.in:1402: warning: AC_CACHE_VAL(smb_attr_cv_xattr_add_opt, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:3353: warning: AC_CACHE_VAL(smb_ldap_cv_ldap_set_rebind_proc, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:3734: warning: AC_CACHE_VAL(smb_krb5_cv_ticket_has_keyinfo, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:3758: warning: AC_CACHE_VAL(smb_krb5_cv_creds_opt_free_context, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:3778: warning: AC_CACHE_VAL(smb_krb5_cv_verify_checksum, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:4120: warning: AC_CACHE_VAL(smb_krb5_cv_enctype_to_string_takes_krb5_context_arg, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:4141: warning: AC_CACHE_VAL(smb_krb5_cv_enctype_to_string_takes_size_t_arg, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:5597: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
samba4.m4:6: warning: file `../m4/check_python.m4' included several times
../lib/util/xattr.m4:9: warning: AC_CACHE_VAL(smb_attr_cv_xattr_add_opt, ...): suspicious cache-id, must contain _cv_ to be cached
samba4.m4:83: warning: file `../lib/tdb/libtdb.m4' included several times
../lib/tevent/samba.m4:3: warning: file `../lib/tevent/libtevent.m4' included several times
configure.in:1402: warning: AC_CACHE_VAL(smb_attr_cv_xattr_add_opt, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:3353: warning: AC_CACHE_VAL(smb_ldap_cv_ldap_set_rebind_proc, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:3734: warning: AC_CACHE_VAL(smb_krb5_cv_ticket_has_keyinfo, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:3758: warning: AC_CACHE_VAL(smb_krb5_cv_creds_opt_free_context, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:3778: warning: AC_CACHE_VAL(smb_krb5_cv_verify_checksum, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:4120: warning: AC_CACHE_VAL(smb_krb5_cv_enctype_to_string_takes_krb5_context_arg, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:4141: warning: AC_CACHE_VAL(smb_krb5_cv_enctype_to_string_takes_size_t_arg, ...): suspicious cache-id, must contain _cv_ to be cached
configure.in:5597: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
samba4.m4:6: warning: file `../m4/check_python.m4' included several times
../lib/util/xattr.m4:9: warning: AC_CACHE_VAL(smb_attr_cv_xattr_add_opt, ...): suspicious cache-id, must contain _cv_ to be cached
samba4.m4:83: warning: file `../lib/tdb/libtdb.m4' included several times
../lib/tevent/samba.m4:3: warning: file `../lib/tevent/libtevent.m4' included several times
modules/vfs_zfsacl.c:285: warning: initialization from incompatible pointer type
modules/vfs_zfsacl.c:287: warning: initialization from incompatible pointer type

追いかけはじめるとハマりそうなので、ログを出しておくだけでそっとしておこうかと思います……
むしろ、files/ の下にある大量のpatch はすんなり当たっているのがなんともかんとも。