mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
- Update to 2.2.9-ja-1.0
PR: ports/67618 Submitted by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (maintainer)
This commit is contained in:
Pav Lucistnik
parent
cab21309cc
commit
4935946660
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=111035
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= samba
|
||||
PORTVERSION= ${SAMBA_VERSION}.j${SAMBA_JA_VERSION}
|
||||
PORTREVISION= 5
|
||||
CATEGORIES= japanese net
|
||||
MASTER_SITES= ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
|
||||
ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \
|
||||
@ -22,8 +21,8 @@ COMMENT= A free SMB and CIFS client and server for UNIX
|
||||
|
||||
CONFLICTS= samba-2.2.* samba-3.0.* sharity-light-1.*
|
||||
|
||||
SAMBA_VERSION= 2.2.8a
|
||||
SAMBA_JA_VERSION= 1.1
|
||||
SAMBA_VERSION= 2.2.9
|
||||
SAMBA_JA_VERSION= 1.0
|
||||
|
||||
USE_BZIP2= yes
|
||||
GNU_CONFIGURE= yes
|
||||
@ -138,12 +137,11 @@ post-clean:
|
||||
@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
|
||||
|
||||
.if defined(WITH_CUPS)
|
||||
#BROKEN= "CUPS support depends on the latest version of gettext whose msgfmt cannot build language catalogs for SWAT"
|
||||
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
|
||||
CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
|
||||
LDFLAGS=-L${LOCALBASE}/lib
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-cups
|
||||
CONFIGURE_ARGS+=--disable-cups
|
||||
.endif
|
||||
|
||||
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
|
||||
@ -173,7 +171,7 @@ MANLANG= "" ja
|
||||
|
||||
SED_PLIST= ${SED} -e 's!${PREFIX}!%D!g'
|
||||
|
||||
PLIST_SUB= AUDIT=${AUDIT} \
|
||||
PLIST_SUB= AUDIT=${AUDIT} \
|
||||
RECYCLE=${RECYCLE} \
|
||||
LIBSAMBA=${LIBSAMBA} \
|
||||
BUILD_VFS=${BUILD_VFS} \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
MD5 (samba-2.2.8a-ja-1.1.tar.bz2) = 5fd05df0691fa40352f696a1a61976e6
|
||||
SIZE (samba-2.2.8a-ja-1.1.tar.bz2) = 7474236
|
||||
MD5 (samba-2.2.9-ja-1.0.tar.bz2) = 7648a1afc62ffb8e1f507f731f3f8de3
|
||||
SIZE (samba-2.2.9-ja-1.0.tar.bz2) = 7474160
|
||||
|
||||
22
japanese/samba/files/patch-Makefile.in
Normal file
22
japanese/samba/files/patch-Makefile.in
Normal file
@ -0,0 +1,22 @@
|
||||
Index: Makefile.in
|
||||
===================================================================
|
||||
RCS file: /project/cvs/samba22-ja/source/Makefile.in,v
|
||||
retrieving revision 1.22
|
||||
diff -u -r1.22 Makefile.in
|
||||
--- Makefile.in 22 Jan 2004 11:24:22 -0000 1.22
|
||||
+++ Makefile.in 6 Jun 2004 01:08:49 -0000
|
||||
@@ -112,10 +112,10 @@
|
||||
FLAGSPO = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) @ARCHFLAGPO@
|
||||
FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) @ARCHFLAG32@
|
||||
FLAGS64 = $(ISA64) $(FLAGS5) $(PASSWD_FLAGS) @ARCHFLAG64@
|
||||
-LDSHFLAGS = @LDSHFLAGS@ @ARCHFLAG@
|
||||
-LDSHFLAGSPO = @LDSHFLAGS@ @ARCHFLAGPO@
|
||||
-LDSHFLAGS32 = @LDSHFLAGS@ @ARCHFLAG32@
|
||||
-LDSHFLAGS64 = @LDSHFLAGS@ @ARCHFLAG64@
|
||||
+LDSHFLAGS = @LDSHFLAGS@ @ARCHFLAG@ $(LDFLAGS)
|
||||
+LDSHFLAGSPO = @LDSHFLAGS@ @ARCHFLAGPO@ $(LDFLAGS)
|
||||
+LDSHFLAGS32 = @LDSHFLAGS@ @ARCHFLAG32@ $(LDFLAGS)
|
||||
+LDSHFLAGS64 = @LDSHFLAGS@ @ARCHFLAG64@ $(LDFLAGS)
|
||||
|
||||
WINBIND_PROGS = @WINBIND_TARGETS@
|
||||
WINBIND_SPROGS = @WINBIND_STARGETS@
|
||||
@ -1,26 +0,0 @@
|
||||
Index: lib/util_sec.c
|
||||
===================================================================
|
||||
RCS file: /project/cvs/samba22-ja/source/lib/util_sec.c,v
|
||||
retrieving revision 1.4
|
||||
diff -u -r1.4 util_sec.c
|
||||
--- lib/util_sec.c 21 Nov 2002 12:53:49 -0000 1.4
|
||||
+++ lib/util_sec.c 21 Jan 2004 01:31:37 -0000
|
||||
@@ -283,6 +283,10 @@
|
||||
|
||||
void restore_re_gid(void)
|
||||
{
|
||||
+ uid_t uid = geteuid();
|
||||
+
|
||||
+ set_effective_uid(0);
|
||||
+
|
||||
#if USE_SETRESUID
|
||||
setresgid(saved_rgid, saved_egid, -1);
|
||||
#elif USE_SETREUID
|
||||
@@ -298,6 +302,7 @@
|
||||
set_effective_gid(saved_egid);
|
||||
#endif
|
||||
|
||||
+ set_effective_uid(uid);
|
||||
assert_gid(saved_rgid, saved_egid);
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- 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
|
||||
File diff suppressed because it is too large
Load Diff
@ -1514,6 +1514,9 @@ share/swat/using_samba/ja/status.html
|
||||
share/swat/using_samba/ja/this_edition.html
|
||||
share/swat/using_samba/licenseinfo.html
|
||||
share/swat/using_samba/this_edition.html
|
||||
@dirrm share/swat/help
|
||||
@dirrm share/swat/images
|
||||
@dirrm share/swat/include
|
||||
@dirrm share/swat/ja/help/BrowsingFAQ/image
|
||||
@dirrm share/swat/ja/help/BrowsingFAQ
|
||||
@dirrm share/swat/ja/help/HowToUseSamba2.2
|
||||
@ -1524,6 +1527,7 @@ share/swat/using_samba/this_edition.html
|
||||
@dirrm share/swat/ja/help
|
||||
@dirrm share/swat/ja/images
|
||||
@dirrm share/swat/ja/include
|
||||
@dirrm share/swat/ja
|
||||
@dirrm share/swat/using_samba/figs
|
||||
@dirrm share/swat/using_samba/gifs
|
||||
@dirrm share/swat/using_samba/ja/figs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user