From owner-svn-ports-branches@FreeBSD.ORG Mon Feb 23 22:07:02 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53996A99; Mon, 23 Feb 2015 22:07:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D6587ED; Mon, 23 Feb 2015 22:07:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1NM72ok072708; Mon, 23 Feb 2015 22:07:02 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1NM7126072703; Mon, 23 Feb 2015 22:07:01 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502232207.t1NM7126072703@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 23 Feb 2015 22:07:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379712 - in branches/2015Q1/dns: bind910 bind99 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Feb 2015 22:07:02 -0000 Author: delphij Date: Mon Feb 23 22:07:00 2015 New Revision: 379712 URL: https://svnweb.freebsd.org/changeset/ports/379712 QAT: https://qat.redports.org/buildarchive/r379712/ Log: MFH: r379326 Update BIND 9.9 and 9.10 to the latest security patch. Security: CVE-2015-1349 Approved by: ports-secteam@ (self) Modified: branches/2015Q1/dns/bind910/Makefile branches/2015Q1/dns/bind910/distinfo branches/2015Q1/dns/bind99/Makefile branches/2015Q1/dns/bind99/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/dns/bind910/Makefile ============================================================================== --- branches/2015Q1/dns/bind910/Makefile Mon Feb 23 21:47:33 2015 (r379711) +++ branches/2015Q1/dns/bind910/Makefile Mon Feb 23 22:07:00 2015 (r379712) @@ -20,7 +20,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.1-P1 +ISCVERSION= 9.10.1-P2 MAKE_JOBS_UNSAFE= yes Modified: branches/2015Q1/dns/bind910/distinfo ============================================================================== --- branches/2015Q1/dns/bind910/distinfo Mon Feb 23 21:47:33 2015 (r379711) +++ branches/2015Q1/dns/bind910/distinfo Mon Feb 23 22:07:00 2015 (r379712) @@ -1,2 +1,2 @@ -SHA256 (bind-9.10.1-P1.tar.gz) = 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d -SIZE (bind-9.10.1-P1.tar.gz) = 8356463 +SHA256 (bind-9.10.1-P2.tar.gz) = 42dced2300ba6147168fe1b7faa2e7740e47b75e481290cd5e4483bd8b8a7feb +SIZE (bind-9.10.1-P2.tar.gz) = 8356565 Modified: branches/2015Q1/dns/bind99/Makefile ============================================================================== --- branches/2015Q1/dns/bind99/Makefile Mon Feb 23 21:47:33 2015 (r379711) +++ branches/2015Q1/dns/bind99/Makefile Mon Feb 23 22:07:00 2015 (r379712) @@ -14,7 +14,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.6-P1 +ISCVERSION= 9.9.6-P2 MAKE_JOBS_UNSAFE= yes @@ -109,8 +109,8 @@ RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -RPZ_PATCH_PATCHFILES= 9.9.6-P1-rpz2+rl.14038.05.patch:vix -RPZ_PATCH_PATCH_SITES= http://ss.vix.su/~vjs/:vix ${MASTER_SITE_LOCAL:S/%SUBDIR%/mat\/bind/:S/$/:vix/} +RPZ_PATCH_PATCHFILES= ${ISCVERSION}-rpz2+rl.14038.05.patch.xz:vix +RPZ_PATCH_PATCH_SITES= http://ss.vix.su/~vjs/:vix LOCAL/mat/bind:vix RRL_CONFIGURE_ENABLE= rrl Modified: branches/2015Q1/dns/bind99/distinfo ============================================================================== --- branches/2015Q1/dns/bind99/distinfo Mon Feb 23 21:47:33 2015 (r379711) +++ branches/2015Q1/dns/bind99/distinfo Mon Feb 23 22:07:00 2015 (r379712) @@ -1,4 +1,4 @@ -SHA256 (bind-9.9.6-P1.tar.gz) = dfedcb2b414d2803accd1a9c21d183178a288f40a2486af5ec0d3369a8cb8526 -SIZE (bind-9.9.6-P1.tar.gz) = 7816337 -SHA256 (9.9.6-P1-rpz2+rl.14038.05.patch) = b978d634c3deb1de42418700ac28ec947373f8979a4bbe2230d0eea462a6cc86 -SIZE (9.9.6-P1-rpz2+rl.14038.05.patch) = 194778 +SHA256 (bind-9.9.6-P2.tar.gz) = 5e882f453a8c799a121272f68bdb90936ce97bb857f8c2b3af1c8ba3d1b749ed +SIZE (bind-9.9.6-P2.tar.gz) = 7816640 +SHA256 (9.9.6-P2-rpz2+rl.14038.05.patch.xz) = b69825ddee742dbb342f2da4265ff2139256ad79bd0d029ba010b7bf98f2d1e5 +SIZE (9.9.6-P2-rpz2+rl.14038.05.patch.xz) = 38792 From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 25 00:02:53 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0AB16A98; Wed, 25 Feb 2015 00:02:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9C78F0B; Wed, 25 Feb 2015 00:02:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1P02qrV022067; Wed, 25 Feb 2015 00:02:52 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1P02qcR022064; Wed, 25 Feb 2015 00:02:52 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201502250002.t1P02qcR022064@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Wed, 25 Feb 2015 00:02:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379855 - branches/2015Q1/net/samba36 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2015 00:02:53 -0000 Author: zi Date: Wed Feb 25 00:02:51 2015 New Revision: 379855 URL: https://svnweb.freebsd.org/changeset/ports/379855 QAT: https://qat.redports.org/buildarchive/r379855/ Log: MFH: r379815 - Update to 3.6.25 to patch Remote Code Execution vulnerability With hat: ports-secteam@ Security: 996c219c-bbb1-11e4-88ae-d050992ecde8 Approved by: ports-secteam Modified: branches/2015Q1/net/samba36/Makefile branches/2015Q1/net/samba36/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/net/samba36/Makefile ============================================================================== --- branches/2015Q1/net/samba36/Makefile Tue Feb 24 23:03:00 2015 (r379854) +++ branches/2015Q1/net/samba36/Makefile Wed Feb 25 00:02:51 2015 (r379855) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= ${SAMBA_BASENAME}36 -PORTVERSION= 3.6.24 -PORTREVISION?= 2 +PORTVERSION= 3.6.25 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba samba/stable samba/pre Modified: branches/2015Q1/net/samba36/distinfo ============================================================================== --- branches/2015Q1/net/samba36/distinfo Tue Feb 24 23:03:00 2015 (r379854) +++ branches/2015Q1/net/samba36/distinfo Wed Feb 25 00:02:51 2015 (r379855) @@ -1,2 +1,2 @@ -SHA256 (samba-3.6.24.tar.gz) = 11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7 -SIZE (samba-3.6.24.tar.gz) = 34122116 +SHA256 (samba-3.6.25.tar.gz) = 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 +SIZE (samba-3.6.25.tar.gz) = 34121828 From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 25 00:17:55 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88D7ADDB; Wed, 25 Feb 2015 00:17:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72088A3; Wed, 25 Feb 2015 00:17:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1P0Htse028252; Wed, 25 Feb 2015 00:17:55 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1P0HqbI028228; Wed, 25 Feb 2015 00:17:52 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201502250017.t1P0HqbI028228@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Wed, 25 Feb 2015 00:17:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379856 - in branches/2015Q1/net: samba36 samba4 samba4/files samba41 samba41/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2015 00:17:55 -0000 Author: zi Date: Wed Feb 25 00:17:51 2015 New Revision: 379856 URL: https://svnweb.freebsd.org/changeset/ports/379856 QAT: https://qat.redports.org/buildarchive/r379856/ Log: - Patch CVE-2015-0240 Approved by: ports-secteam With hat: ports-secteam MFH: 2015Q1 Security: 996c219c-bbb1-11e4-88ae-d050992ecde8 Added: branches/2015Q1/net/samba4/files/patch-nsswitch__wscript_build - copied unchanged from r377151, head/net/samba4/files/patch-nsswitch__wscript_build branches/2015Q1/net/samba41/files/patch-nsswitch__wscript_build - copied unchanged from r377151, head/net/samba41/files/patch-nsswitch__wscript_build Modified: branches/2015Q1/net/samba36/Makefile branches/2015Q1/net/samba4/Makefile branches/2015Q1/net/samba4/distinfo branches/2015Q1/net/samba4/files/patch-source3__wscript_build branches/2015Q1/net/samba4/files/samba_server.in branches/2015Q1/net/samba41/Makefile branches/2015Q1/net/samba41/distinfo branches/2015Q1/net/samba41/files/patch-source3__wscript_build branches/2015Q1/net/samba41/files/samba_server.in branches/2015Q1/net/samba41/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/net/samba36/Makefile ============================================================================== --- branches/2015Q1/net/samba36/Makefile Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba36/Makefile Wed Feb 25 00:17:51 2015 (r379856) @@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= samba samba/stable s DISTNAME= ${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB and CIFS client and server for UNIX +COMMENT?= Free SMB and CIFS client and server for Unix LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING @@ -32,7 +32,7 @@ AUTOHEADER_ARGS= ${IPATHS} AUTOCONF_ARGS= ${IPATHS} GNU_CONFIGURE= yes -USES= gmake pkgconfig iconv execinfo cpe +USES= cpe execinfo gmake iconv pkgconfig USE_AUTOTOOLS= autoconf autoheader USE_LDCONFIG= ${SAMBA_LIBDIR} # pkg-config is used to find talloc @@ -99,21 +99,35 @@ CONFIGURE_ARGS+= ${ICONV_CONFIGURE_BASE} .if !defined(SAMBA_SUBPORT) OPTIONS_DEFINE= ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DNSUPDATE \ - DOCS EXAMPLES EXP_MODULES FAM_SUPPORT IPV6 LDAP \ + DOCS EXAMPLES EXP_MODULES FAM IPV6 LDAP \ MAX_DEBUG PAM_SMBPASS POPT PTHREADPOOL QUOTAS \ SMBTORTURE SWAT SYSLOG UTMP WINBIND +OPTIONS_RADIO= GSSAPI +OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= ACL_SUPPORT AIO_SUPPORT CUPS LDAP POPT PTHREADPOOL \ - WINBIND + WINBIND GSSAPI_NONE ACL_SUPPORT_DESC= ACL support + ADS_DESC= Active Directory support +ADS_CONFIGURE_ON= --with-ads --with-krb5="${GSSAPIBASEDIR}" +ADS_CONFIGURE_OFF= --without-ads --without-krb5 + AIO_SUPPORT_DESC= Asyncronous IO support DNSUPDATE_DESC= Dynamic DNS update(require ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor + +GSSAPI_BASE_DESC= Use Heimdal in base +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_DESC= Use Heimdal from ports +GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags +GSSAPI_MIT_DESC= Use MIT Kerberos V5 +GSSAPI_MIT_USES= gssapi:mit,flags +GSSAPI_NONE_DESC= No Kerberos support + MAX_DEBUG_DESC= Maximum debugging -PAM_SMBPASS_DESC= PAM authentication vs passdb backends +PAM_SMBPASS_DESC= PAM authentication via passdb backends POPT_DESC= System-wide POPT library PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support @@ -237,7 +251,7 @@ WANT_EXP_MODULES+= vfs_cacheprime vfs_ca . endif .endif -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam WANT_EXP_MODULES+= vfs_notify_fam CONFIGURE_ARGS+= --enable-fam @@ -317,26 +331,11 @@ PLIST_SUB+= SMBTORTURE="@comment " ### .if ${PORT_OPTIONS:MADS} -SAMBA_WANT_LDAP= yes -SAMBA_WANT_KRB5= yes -CONFIGURE_ARGS+= --with-ads -.else -CONFIGURE_ARGS+= --without-ads -.endif +. if ${PORT_OPTIONS:MGSSAPI_NONE} # Kerberos5 is necessary for ADS -.if defined(SAMBA_WANT_KRB5) -.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so) -CONFIGURE_ARGS+= --with-krb5="${KRB5_HOME}" -.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so) -CONFIGURE_ARGS+= --with-krb5="${HEIMDAL_HOME}" -.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config) -CONFIGURE_ARGS+= --with-krb5="/usr" -.else -LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/heimdal -CONFIGURE_ARGS+= --with-krb5="${LOCALBASE}" -.endif -.else -CONFIGURE_ARGS+= --without-krb5 +IGNORE= ADS support requires GSSAPI_BASE, GSSAPI_HEIMDAL, or GSSAPI_MIT +. endif +SAMBA_WANT_LDAP= yes .endif .if defined(SAMBA_WANT_LDAP) @@ -392,7 +391,7 @@ SAMBA_MAN8+= pam_winbind.8 winbindd.8 SAMBA_MAN8+= swat.8 .endif -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} SAMBA_MAN8+= vfs_notify_fam.8 .endif Modified: branches/2015Q1/net/samba4/Makefile ============================================================================== --- branches/2015Q1/net/samba4/Makefile Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba4/Makefile Wed Feb 25 00:17:51 2015 (r379856) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= samba/stable samba/r DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB/CIFS and AD/DC server and client for UNIX +COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 @@ -18,7 +18,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba41-4. SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.0.23 +SAMBA4_VERSION= 4.0.25 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -64,7 +64,8 @@ DESTDIRNAME= --destdir CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -USES= shebangfix compiler perl5 python:2 pkgconfig iconv readline execinfo cpe +USES= compiler cpe execinfo iconv perl5 pkgconfig \ + python:2 readline shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf @@ -72,7 +73,8 @@ CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -# XXX: Unconditional dependencies which can't be switched off(if present in the system) +# XXX: Unconditional dependencies which can't be switched off (if present +# in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify @@ -108,20 +110,19 @@ SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP -OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ +OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support -AIO_SUPPORT_DESC= Asyncronous IO support -DNSUPDATE_DESC= Dynamic DNS update(require ADS) +AIO_SUPPORT_DESC= Asynchronous IO support +DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends @@ -136,10 +137,11 @@ DEVELOPER_DESC= With development suppor MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF -OPTIONS_RADIO_DNS= NSUPDATE BIND99 +OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER - + BIND99_DESC= Use bind99 as AD DC DNS server frontend +BIND910_DESC= Use bind910 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include @@ -161,6 +163,9 @@ CFLAGS+= -fno-omit-frame-pointer .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " +.elif ${PORT_OPTIONS:MBIND910} +RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 +SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" @@ -273,7 +278,7 @@ CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam Modified: branches/2015Q1/net/samba4/distinfo ============================================================================== --- branches/2015Q1/net/samba4/distinfo Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba4/distinfo Wed Feb 25 00:17:51 2015 (r379856) @@ -1,2 +1,2 @@ -SHA256 (samba-4.0.23.tar.gz) = 47d7b9d0caf76ea111794c6181db2fed5c15fd496a5a9eaa8ed4323302c72118 -SIZE (samba-4.0.23.tar.gz) = 22140738 +SHA256 (samba-4.0.25.tar.gz) = e6a07940a658b81d368fc7ed8e5068bd27188996d73dee1cea9755682cb9a485 +SIZE (samba-4.0.25.tar.gz) = 22150978 Copied: branches/2015Q1/net/samba4/files/patch-nsswitch__wscript_build (from r377151, head/net/samba4/files/patch-nsswitch__wscript_build) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/samba4/files/patch-nsswitch__wscript_build Wed Feb 25 00:17:51 2015 (r379856, copy of r377151, head/net/samba4/files/patch-nsswitch__wscript_build) @@ -0,0 +1,15 @@ +--- nsswitch/wscript_build.orig 2015-01-15 23:07:01.654902807 +0000 ++++ nsswitch/wscript_build 2015-01-15 23:11:43.587388779 +0000 +@@ -57,6 +57,12 @@ + realname='nss_winbind.so.1', + vnum='1') + ++ bld.SAMBA3_LIBRARY('nss_wins', ++ source='wins.c wins_freebsd.c', ++ deps='''param libsmb LIBTSOCKET''', ++ realname='nss_wins.so.1', ++ vnum='1') ++ + elif (host_os.rfind('netbsd') > -1): + # NetBSD winbind client is implemented as a wrapper + # around the Linux version. It needs getpwent_r() to Modified: branches/2015Q1/net/samba4/files/patch-source3__wscript_build ============================================================================== --- branches/2015Q1/net/samba4/files/patch-source3__wscript_build Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba4/files/patch-source3__wscript_build Wed Feb 25 00:17:51 2015 (r379856) @@ -1,34 +1,20 @@ ---- source3/wscript_build.orig 2013-07-01 09:15:40.000000000 +0200 -+++ source3/wscript_build 2013-11-12 10:13:36.004046408 +0100 -@@ -1,7 +1,8 @@ - #!/usr/bin/env python - - from samba_utils import * --import samba_version, samba3 -+import samba_version, samba3, sys -+host_os = sys.platform - - TDB_LIB_SRC = ''' - lib/dbwrap/dbwrap_open.c -@@ -651,7 +652,16 @@ +--- source3/wscript_build.orig 2014-12-08 07:46:38.000000000 +0000 ++++ source3/wscript_build 2015-01-16 00:11:55.966511894 +0000 +@@ -653,13 +653,6 @@ vnum='0', vars=locals()) -bld.SAMBA3_LIBRARY('nss_wins', -+if (host_os.rfind('freebsd') > -1): -+ # FreeBSD winbind client is implemented as a wrapper around -+ # the Linux version. -+ bld.SAMBA3_LIBRARY('nss_wins', -+ source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']), -+ deps='''param libsmb LIBTSOCKET''', -+ realname='nss_wins.so.1', -+ vnum='1') -+else: -+ bld.SAMBA3_LIBRARY('nss_wins', - source=WINBIND_WINS_NSS_SRC, - deps='''param libsmb LIBTSOCKET''', - realname='libnss_wins.so.2', -@@ -972,10 +982,12 @@ +- source=WINBIND_WINS_NSS_SRC, +- deps='''param libsmb LIBTSOCKET''', +- realname='libnss_wins.so.2', +- soname='libnss_wins.so', +- vnum='2') +- + bld.SAMBA3_LIBRARY('gse', + source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c', + deps='krb5samba gensec param KRBCLIENT secrets3', +@@ -975,10 +968,12 @@ LIBAFS_SETTOKEN RPC_SERVER NDR_SMBXSRV @@ -42,7 +28,7 @@ ''' + bld.env['dmapi_lib'], private_library=True, vars=locals()) -@@ -1277,6 +1289,7 @@ +@@ -1284,6 +1279,7 @@ libsmb msrpc3 RPC_NDR_SRVSVC @@ -50,7 +36,7 @@ cli_smb_common''') bld.SAMBA3_BINARY('net', -@@ -1629,7 +1642,7 @@ +@@ -1636,7 +1632,7 @@ bld.SAMBA3_PYTHON('pylibsmb', source='libsmb/pylibsmb.c', Modified: branches/2015Q1/net/samba4/files/samba_server.in ============================================================================== --- branches/2015Q1/net/samba4/files/samba_server.in Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba4/files/samba_server.in Wed Feb 25 00:17:51 2015 (r379856) @@ -27,15 +27,9 @@ name="samba_server" rcvar=${name}_enable - # Defaults samba_server_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%" -samba_server_config=${samba_server_config=${samba_server_config_default}} -samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" -#testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" -testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" smbcontrol_command="%%PREFIX%%/bin/smbcontrol" - # Custom commands extra_commands="reload status" @@ -48,7 +42,6 @@ status_cmd="samba_server_cmd" reload_cmd="samba_server_reload_cmd" rcvar_cmd="samba_server_rcvar_cmd" - samba_server_checkconfig() { echo -n "Performing sanity check on Samba configuration: " if ${testparm_command} >/dev/null 2>&1; then @@ -144,6 +137,14 @@ samba_server_cmd() { samba_server_config_init() { local name + # Load configuration + load_rc_config "${name}" + # Defaults + samba_server_enable=${samba_server_enable:=NO} + samba_server_config=${samba_server_config=${samba_server_config_default}} + samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" + #testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" + testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" # Determine what daemons are necessary to run Samba in the current role samba_server_role=$(${testparm_command} --parameter-name='server role' 2>/dev/null) case "${samba_server_role}" in @@ -154,38 +155,34 @@ samba_server_config_init() { samba_daemons="nmbd smbd winbindd" ;; esac - # Load configuration - load_rc_config "${name}" + # Load daemons configuration for name in ${samba_daemons}; do load_rc_config "${name}" - done - # Defaults - samba_server_enable=${samba_server_enable:=NO} - # Setup dependent variables - if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then - for name in ${samba_daemons}; do - # Winbindd - if [ "${name}" = "winbindd" ]; then + # If samba_server_enable is 'YES' + if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then + if [ "${name}" != "winbindd" ]; then + # Set variable to 'YES' only if it is unset + eval ${name}_enable=\${${name}_enable-YES} + else + # Winbindd samba_server_idmap=$(${testparm_command} --parameter-name='idmap uid' 2>/dev/null) if [ -n "${samba_server_idmap}" ]; then winbindd_enable="YES" fi fi - # Set variable to 'YES' only if it is unset - eval ${name}_enable=\${${name}_enable-YES} - # If variable is empty set it to 'NO' - eval ${name}_enable=\${${name}_enable:-NO} - done - fi + fi + # If variable is empty, set it to 'NO' + eval ${name}_enable=\${${name}_enable:-NO} + done + # Fetch parameters from configuration file + samba_server_lockdir="$(${testparm_command} --parameter-name='lock directory' 2>/dev/null)" + samba_server_lockdir=${samba_server_lockdir:=%%SAMBA4_LOCKDIR%%} + samba_server_piddir="$(${testparm_command} --parameter-name='pid directory' 2>/dev/null)" + samba_server_piddir=${samba_server_piddir:=%%SAMBA4_RUNDIR%%} } # Load configuration variables samba_server_config_init -# Fetch parameters from configuration file -samba_server_lockdir=$(${testparm_command} --parameter-name='lock directory' 2>/dev/null) -samba_server_lockdir=${samba_server_lockdir=%%SAMBA4_LOCKDIR%%} -samba_server_piddir=$(${testparm_command} --parameter-name='pid directory' 2>/dev/null) -samba_server_piddir=${samba_server_piddir=%%SAMBA4_RUNDIR%%} # Common flags command_args=${samba_server_configfile_arg} samba_flags=${samba_flags="--daemon"} Modified: branches/2015Q1/net/samba41/Makefile ============================================================================== --- branches/2015Q1/net/samba41/Makefile Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/Makefile Wed Feb 25 00:17:51 2015 (r379856) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= samba/stable samba/r DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB/CIFS and AD/DC server and client for UNIX +COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 @@ -18,7 +18,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.1.14 +SAMBA4_VERSION= 4.1.17 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -64,7 +64,8 @@ DESTDIRNAME= --destdir CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -USES= shebangfix compiler perl5 python:2 pkgconfig iconv readline execinfo cpe +USES= compiler cpe execinfo iconv perl5 pkgconfig \ + python:2 readline shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf @@ -72,7 +73,8 @@ CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -# XXX: Unconditional dependencies which can't be switched off(if present in the system) +# XXX: Unconditional dependencies which can't be switched off (if present +# in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify @@ -87,6 +89,10 @@ LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/ # External Samba dependencies # IDL compiler BUILD_DEPENDS+= p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl +# +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython +PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.0:${PORTSDIR}/devel/talloc RUN_DEPENDS+= talloc>=2.1.0:${PORTSDIR}/devel/talloc @@ -96,8 +102,8 @@ BUILD_DEPENDS+= tevent>=0.9.18:${PORTSD RUN_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb -BUILD_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb -RUN_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb +BUILD_DEPENDS+= tdb>=1.2.12:${PORTSDIR}/databases/tdb +RUN_DEPENDS+= tdb>=1.2.12:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ntdb BUILD_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb @@ -112,20 +118,19 @@ SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SYSLOG UTMP -OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP \ +OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ + DNSUPDATE DOCS FAM LDAP \ PTHREADPOOL QUOTAS SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support -AIO_SUPPORT_DESC= Asyncronous IO support -DNSUPDATE_DESC= Dynamic DNS update(require ADS) +AIO_SUPPORT_DESC= Asynchronous IO support +DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends @@ -139,10 +144,11 @@ DEVELOPER_DESC= With development suppor MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF -OPTIONS_RADIO_DNS= NSUPDATE BIND99 +OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER BIND99_DESC= Use bind99 as AD DC DNS server frontend +BIND910_DESC= Use bind910 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include @@ -164,6 +170,9 @@ CFLAGS+= -fno-omit-frame-pointer .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " +.elif ${PORT_OPTIONS:MBIND910} +RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 +SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" @@ -276,7 +285,7 @@ CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam Modified: branches/2015Q1/net/samba41/distinfo ============================================================================== --- branches/2015Q1/net/samba41/distinfo Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/distinfo Wed Feb 25 00:17:51 2015 (r379856) @@ -1,2 +1,2 @@ -SHA256 (samba-4.1.14.tar.gz) = 5ea14baaca997292355d368918879e3d639def92b54efef2279cf5abe8db2cba -SIZE (samba-4.1.14.tar.gz) = 19527260 +SHA256 (samba-4.1.17.tar.gz) = 7aeb5d09e9c84bbeeb4b98d33404e9dbc4d99c54e64a447cc9c4d57e9255cb1d +SIZE (samba-4.1.17.tar.gz) = 19536407 Copied: branches/2015Q1/net/samba41/files/patch-nsswitch__wscript_build (from r377151, head/net/samba41/files/patch-nsswitch__wscript_build) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/samba41/files/patch-nsswitch__wscript_build Wed Feb 25 00:17:51 2015 (r379856, copy of r377151, head/net/samba41/files/patch-nsswitch__wscript_build) @@ -0,0 +1,15 @@ +--- nsswitch/wscript_build.orig 2015-01-15 23:07:01.654902807 +0000 ++++ nsswitch/wscript_build 2015-01-15 23:11:43.587388779 +0000 +@@ -57,6 +57,12 @@ + realname='nss_winbind.so.1', + vnum='1') + ++ bld.SAMBA3_LIBRARY('nss_wins', ++ source='wins.c wins_freebsd.c', ++ deps='''param libsmb LIBTSOCKET''', ++ realname='nss_wins.so.1', ++ vnum='1') ++ + elif (host_os.rfind('netbsd') > -1): + # NetBSD winbind client is implemented as a wrapper + # around the Linux version. It needs getpwent_r() to Modified: branches/2015Q1/net/samba41/files/patch-source3__wscript_build ============================================================================== --- branches/2015Q1/net/samba41/files/patch-source3__wscript_build Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/files/patch-source3__wscript_build Wed Feb 25 00:17:51 2015 (r379856) @@ -1,33 +1,5 @@ --- source3/wscript_build.orig 2013-09-06 09:39:57.000000000 +0000 +++ source3/wscript_build 2013-11-20 00:35:51.687173831 +0000 -@@ -1,7 +1,8 @@ - #!/usr/bin/env python - - from samba_utils import * --import samba_version, samba3 -+import samba_version, samba3, sys -+host_os = sys.platform - - TDB_LIB_SRC = ''' - lib/dbwrap/dbwrap_open.c -@@ -654,7 +655,16 @@ - vnum='0', - vars=locals()) - --bld.SAMBA3_LIBRARY('nss_wins', -+if (host_os.rfind('freebsd') > -1): -+ # FreeBSD winbind client is implemented as a wrapper around -+ # the Linux version. -+ bld.SAMBA3_LIBRARY('nss_wins', -+ source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']), -+ deps='''param libsmb LIBTSOCKET''', -+ realname='nss_wins.so.1', -+ vnum='1') -+else: -+ bld.SAMBA3_LIBRARY('nss_wins', - source=WINBIND_WINS_NSS_SRC, - deps='''param libsmb LIBTSOCKET''', - realname='libnss_wins.so.2', @@ -976,11 +986,13 @@ LIBAFS_SETTOKEN RPC_SERVER Modified: branches/2015Q1/net/samba41/files/samba_server.in ============================================================================== --- branches/2015Q1/net/samba41/files/samba_server.in Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/files/samba_server.in Wed Feb 25 00:17:51 2015 (r379856) @@ -27,15 +27,9 @@ name="samba_server" rcvar=${name}_enable - # Defaults samba_server_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%" -samba_server_config=${samba_server_config=${samba_server_config_default}} -samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" -#testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" -testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" smbcontrol_command="%%PREFIX%%/bin/smbcontrol" - # Custom commands extra_commands="reload status" @@ -48,7 +42,6 @@ status_cmd="samba_server_cmd" reload_cmd="samba_server_reload_cmd" rcvar_cmd="samba_server_rcvar_cmd" - samba_server_checkconfig() { echo -n "Performing sanity check on Samba configuration: " if ${testparm_command} >/dev/null 2>&1; then @@ -144,6 +137,14 @@ samba_server_cmd() { samba_server_config_init() { local name + # Load configuration + load_rc_config "${name}" + # Defaults + samba_server_enable=${samba_server_enable:=NO} + samba_server_config=${samba_server_config=${samba_server_config_default}} + samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" + #testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" + testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" # Determine what daemons are necessary to run Samba in the current role samba_server_role=$(${testparm_command} --parameter-name='server role' 2>/dev/null) case "${samba_server_role}" in @@ -154,38 +155,34 @@ samba_server_config_init() { samba_daemons="nmbd smbd winbindd" ;; esac - # Load configuration - load_rc_config "${name}" + # Load daemons configuration for name in ${samba_daemons}; do load_rc_config "${name}" - done - # Defaults - samba_server_enable=${samba_server_enable:=NO} - # Setup dependent variables - if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then - for name in ${samba_daemons}; do - # Winbindd - if [ "${name}" = "winbindd" ]; then + # If samba_server_enable is 'YES' + if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then + if [ "${name}" != "winbindd" ]; then + # Set variable to 'YES' only if it is unset + eval ${name}_enable=\${${name}_enable-YES} + else + # Winbindd samba_server_idmap=$(${testparm_command} --parameter-name='idmap uid' 2>/dev/null) if [ -n "${samba_server_idmap}" ]; then winbindd_enable="YES" fi fi - # Set variable to 'YES' only if it is unset - eval ${name}_enable=\${${name}_enable-YES} - # If variable is empty set it to 'NO' - eval ${name}_enable=\${${name}_enable:-NO} - done - fi + fi + # If variable is empty, set it to 'NO' + eval ${name}_enable=\${${name}_enable:-NO} + done + # Fetch parameters from configuration file + samba_server_lockdir="$(${testparm_command} --parameter-name='lock directory' 2>/dev/null)" + samba_server_lockdir=${samba_server_lockdir:=%%SAMBA4_LOCKDIR%%} + samba_server_piddir="$(${testparm_command} --parameter-name='pid directory' 2>/dev/null)" + samba_server_piddir=${samba_server_piddir:=%%SAMBA4_RUNDIR%%} } # Load configuration variables samba_server_config_init -# Fetch parameters from configuration file -samba_server_lockdir=$(${testparm_command} --parameter-name='lock directory' 2>/dev/null) -samba_server_lockdir=${samba_server_lockdir=%%SAMBA4_LOCKDIR%%} -samba_server_piddir=$(${testparm_command} --parameter-name='pid directory' 2>/dev/null) -samba_server_piddir=${samba_server_piddir=%%SAMBA4_RUNDIR%%} # Common flags command_args=${samba_server_configfile_arg} samba_flags=${samba_flags="--daemon"} Modified: branches/2015Q1/net/samba41/pkg-plist ============================================================================== --- branches/2015Q1/net/samba41/pkg-plist Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/pkg-plist Wed Feb 25 00:17:51 2015 (r379856) @@ -531,86 +531,86 @@ libdata/pkgconfig/wbclient.pc %%PYTHON_SITELIBDIR%%/samba/drs_utils.py %%PYTHON_SITELIBDIR%%/samba/dsdb.so %%PYTHON_SITELIBDIR%%/samba/external/__init__.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/__init__.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/dnssec.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/e164.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/edns.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/entropy.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/exception.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/flags.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/hash.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/inet.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv4.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv6.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/message.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/name.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/namedict.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/node.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/opcode.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/query.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rcode.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdata.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataclass.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataset.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdatatype.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/AFSDB.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CERT.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CNAME.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DLV.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNAME.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNSKEY.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DS.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/GPOS.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HINFO.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HIP.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/ISDN.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/LOC.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/MX.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NS.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/PTR.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RP.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RRSIG.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RT.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SOA.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SPF.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SSHFP.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/TXT.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/X25.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/__init__.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/A.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/AAAA.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/APL.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/DHCID.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/IPSECKEY.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/KX.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NAPTR.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP_PTR.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/PX.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/SRV.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/WKS.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/__init__.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/__init__.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/dsbase.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/mxbase.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/nsbase.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/txtbase.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/renderer.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/resolver.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/reversename.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/rrset.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/set.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/tokenizer.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/tsig.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/tsigkeyring.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/ttl.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/update.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/version.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/wiredata.py -%%PYTHON_SITELIBDIR%%/samba/external/dns/zone.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/__init__.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/dnssec.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/e164.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/edns.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/entropy.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/exception.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/flags.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/hash.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/inet.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv4.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv6.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/message.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/name.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/namedict.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/node.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/opcode.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/query.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rcode.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdata.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataclass.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataset.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdatatype.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/AFSDB.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CERT.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CNAME.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DLV.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNAME.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNSKEY.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DS.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/GPOS.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HINFO.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HIP.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/ISDN.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/LOC.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/MX.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NS.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/PTR.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RP.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RRSIG.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RT.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SOA.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SPF.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SSHFP.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/TXT.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/X25.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/__init__.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/A.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/AAAA.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/APL.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/DHCID.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/IPSECKEY.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/KX.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NAPTR.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP_PTR.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/PX.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/SRV.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/WKS.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/__init__.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/__init__.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/dsbase.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/mxbase.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/nsbase.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/txtbase.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/renderer.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/resolver.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/reversename.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rrset.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/set.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tokenizer.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tsig.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tsigkeyring.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ttl.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/update.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/version.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/wiredata.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/zone.py %%PYTHON_SITELIBDIR%%/samba/external/subunit/__init__.py %%PYTHON_SITELIBDIR%%/samba/external/subunit/chunked.py %%PYTHON_SITELIBDIR%%/samba/external/subunit/details.py @@ -820,10 +820,10 @@ libdata/pkgconfig/wbclient.pc @dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools @dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests @dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit -@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN -@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY -@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes -@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns +%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN +%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY +%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes +%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns @dirrm %%PYTHON_SITELIBDIR%%/samba/external @dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc @dirrm %%PYTHON_SITELIBDIR%%/samba From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 25 22:13:39 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B595CD35; Wed, 25 Feb 2015 22:13:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A047C1BD; Wed, 25 Feb 2015 22:13:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PMDdpr063032; Wed, 25 Feb 2015 22:13:39 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PMDdbV063031; Wed, 25 Feb 2015 22:13:39 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201502252213.t1PMDdbV063031@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 25 Feb 2015 22:13:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379965 - branches/2015Q1/math/miracl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2015 22:13:39 -0000 Author: bdrewery Date: Wed Feb 25 22:13:38 2015 New Revision: 379965 URL: https://svnweb.freebsd.org/changeset/ports/379965 QAT: https://qat.redports.org/buildarchive/r379965/ Log: MFH: r379964 Force using a modern compiler to fix build on 9.3 which has a broken GCC. The problem was introduced in src r259111 and fixed in r270099. Modified: branches/2015Q1/math/miracl/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/math/miracl/Makefile ============================================================================== --- branches/2015Q1/math/miracl/Makefile Wed Feb 25 22:03:29 2015 (r379964) +++ branches/2015Q1/math/miracl/Makefile Wed Feb 25 22:13:38 2015 (r379965) @@ -24,7 +24,7 @@ LICENSE_PERMS_COMMERCIAL= dist-mirror di ONLY_FOR_ARCHS= i386 amd64 -USES= zip +USES= zip compiler:c++0x USE_LDCONFIG= yes EXTRACT_BEFORE_ARGS= -j -L -q From owner-svn-ports-branches@FreeBSD.ORG Thu Feb 26 14:59:50 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D94144A7; Thu, 26 Feb 2015 14:59:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA63C140; Thu, 26 Feb 2015 14:59:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QExnPx037729; Thu, 26 Feb 2015 14:59:49 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QExnsm037725; Thu, 26 Feb 2015 14:59:49 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201502261459.t1QExnsm037725@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 26 Feb 2015 14:59:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380009 - branches/2015Q1/ftp/curl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2015 14:59:50 -0000 Author: zi Date: Thu Feb 26 14:59:48 2015 New Revision: 380009 URL: https://svnweb.freebsd.org/changeset/ports/380009 QAT: https://qat.redports.org/buildarchive/r380009/ Log: MFH: r376637 - Update to 7.40.0 Changes: http://curl.haxx.se/changes.html Security: CVE-2014-8150 Security: CVE-2014-8151 Approved by: ports-secteam With hat: ports-secteam Modified: branches/2015Q1/ftp/curl/Makefile branches/2015Q1/ftp/curl/distinfo branches/2015Q1/ftp/curl/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/ftp/curl/Makefile ============================================================================== --- branches/2015Q1/ftp/curl/Makefile Thu Feb 26 14:50:37 2015 (r380008) +++ branches/2015Q1/ftp/curl/Makefile Thu Feb 26 14:59:48 2015 (r380009) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.39.0 -PORTREVISION?= 1 +PORTVERSION= 7.40.0 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet @@ -165,6 +164,7 @@ post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|include |include |' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h + @${REINPLACE_CMD} -e 's|gss_nt_service_name|GSS_C_NT_HOSTBASED_SERVICE|' ${WRKSRC}/lib/curl_sasl_gssapi.c post-install: .if !defined(BUILDING_HIPHOP) @@ -177,7 +177,7 @@ post-install: cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/ .endif -x-regression-test test: build +regression-test test: build .if !${PORT_OPTIONS:MPROXY} @${ECHO_MSG} "******************************************" @${ECHO_MSG} "* You have disabled curl proxy support. *" Modified: branches/2015Q1/ftp/curl/distinfo ============================================================================== --- branches/2015Q1/ftp/curl/distinfo Thu Feb 26 14:50:37 2015 (r380008) +++ branches/2015Q1/ftp/curl/distinfo Thu Feb 26 14:59:48 2015 (r380009) @@ -1,2 +1,2 @@ -SHA256 (curl-7.39.0.tar.lzma) = 8aaac1c853ef9edd7bc708bc596e7703c6bda35d6ddae78c6d72d8550024fc8f -SIZE (curl-7.39.0.tar.lzma) = 2648528 +SHA256 (curl-7.40.0.tar.lzma) = 47dff2367ff3343ce3a4661ddb0ce8d03b18e868f77fc82ae77b2c23587325a8 +SIZE (curl-7.40.0.tar.lzma) = 2684351 Modified: branches/2015Q1/ftp/curl/pkg-plist ============================================================================== --- branches/2015Q1/ftp/curl/pkg-plist Thu Feb 26 14:50:37 2015 (r380008) +++ branches/2015Q1/ftp/curl/pkg-plist Thu Feb 26 14:59:48 2015 (r380009) @@ -226,6 +226,7 @@ man/man3/CURLOPT_TLSAUTH_TYPE.3.gz man/man3/CURLOPT_TLSAUTH_USERNAME.3.gz man/man3/CURLOPT_TRANSFERTEXT.3.gz man/man3/CURLOPT_TRANSFER_ENCODING.3.gz +man/man3/CURLOPT_UNIX_SOCKET_PATH.3.gz man/man3/CURLOPT_UNRESTRICTED_AUTH.3.gz man/man3/CURLOPT_UPLOAD.3.gz man/man3/CURLOPT_URL.3.gz From owner-svn-ports-branches@FreeBSD.ORG Thu Feb 26 15:00:39 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00390595; Thu, 26 Feb 2015 15:00:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DFB74152; Thu, 26 Feb 2015 15:00:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QF0ck3038605; Thu, 26 Feb 2015 15:00:38 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QF0cbn038604; Thu, 26 Feb 2015 15:00:38 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201502261500.t1QF0cbn038604@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 26 Feb 2015 15:00:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380010 - branches/2015Q1/ftp/curl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2015 15:00:39 -0000 Author: zi Date: Thu Feb 26 15:00:38 2015 New Revision: 380010 URL: https://svnweb.freebsd.org/changeset/ports/380010 QAT: https://qat.redports.org/buildarchive/r380010/ Log: MFH: r377313 - Use INSTALL_TARGET=install-strip instead of MAKE_ENV=INSTALL_STRIP_FLAG=${STRIP} Approved by: ports-secteam With hat: ports-secteam Modified: branches/2015Q1/ftp/curl/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/ftp/curl/Makefile ============================================================================== --- branches/2015Q1/ftp/curl/Makefile Thu Feb 26 14:59:48 2015 (r380009) +++ branches/2015Q1/ftp/curl/Makefile Thu Feb 26 15:00:38 2015 (r380010) @@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--disable-werror \ --without-axtls CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} GNU_CONFIGURE= yes -MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP} +INSTALL_TARGET= install-strip USE_PERL5= build USES= libtool pathfix perl5 tar:lzma From owner-svn-ports-branches@FreeBSD.ORG Thu Feb 26 15:02:43 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 922F7696; Thu, 26 Feb 2015 15:02:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D1A81FE; Thu, 26 Feb 2015 15:02:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QF2hag041958; Thu, 26 Feb 2015 15:02:43 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QF2gIk041955; Thu, 26 Feb 2015 15:02:42 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201502261502.t1QF2gIk041955@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 26 Feb 2015 15:02:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380011 - branches/2015Q1/devel/libevent2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2015 15:02:43 -0000 Author: zi Date: Thu Feb 26 15:02:42 2015 New Revision: 380011 URL: https://svnweb.freebsd.org/changeset/ports/380011 QAT: https://qat.redports.org/buildarchive/r380011/ Log: MFH: r376665 Update libevent2 to 2.0.22 PR: 199640 Submitted by: Jan Beich Security: daa8a49b-99b9-11e4-8f66-3085a9a4510d Approved by: ports-secteam With hat: ports-secteam Modified: branches/2015Q1/devel/libevent2/Makefile branches/2015Q1/devel/libevent2/distinfo branches/2015Q1/devel/libevent2/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/libevent2/Makefile ============================================================================== --- branches/2015Q1/devel/libevent2/Makefile Thu Feb 26 15:00:38 2015 (r380010) +++ branches/2015Q1/devel/libevent2/Makefile Thu Feb 26 15:02:42 2015 (r380011) @@ -2,11 +2,8 @@ # $FreeBSD$ PORTNAME= libevent2 -PORTVERSION= 2.0.21 -PORTREVISION= 3 +PORTVERSION= 2.0.22 CATEGORIES= devel -MASTER_SITES= http://cloud.github.com/downloads/libevent/libevent/ -DISTNAME= ${PORTNAME:S/2//}-${DISTVERSION}-stable MAINTAINER= mm@FreeBSD.org COMMENT= API for executing callback functions on events or timeouts @@ -14,8 +11,15 @@ COMMENT= API for executing callback func LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USE_GITHUB= yes +GH_ACCOUNT= ${GH_PROJECT} +GH_PROJECT= ${PORTNAME:S/2$//} +GH_TAGNAME= release-${DISTVERSION}-stable +GH_COMMIT= d8ceae8 + GNU_CONFIGURE= yes -USES= libtool pathfix +USES= autoreconf libtool pathfix +PATHFIX_MAKEFILEIN=Makefile.am USE_LDCONFIG= yes OPTIONS_DEFINE= OPENSSL THREADS @@ -30,6 +34,11 @@ OPENSSL_CONFIGURE_ENABLE= openssl THREADS_CONFIGURE_ENABLE= support +post-patch: + ${ECHO_CMD} 'AC_CONFIG_MACRO_DIR([m4])' >>${WRKSRC}/configure.in +# error: using '$(top_srcdir)' in TESTS is currently broken + ${REINPLACE_CMD} 's/^TESTS.*top_srcdir/#&/' ${WRKSRC}/test/Makefile.am + regression-test: build @(${SH} ${WRKSRC}/test/regress) Modified: branches/2015Q1/devel/libevent2/distinfo ============================================================================== --- branches/2015Q1/devel/libevent2/distinfo Thu Feb 26 15:00:38 2015 (r380010) +++ branches/2015Q1/devel/libevent2/distinfo Thu Feb 26 15:02:42 2015 (r380011) @@ -1,2 +1,2 @@ -SHA256 (libevent-2.0.21-stable.tar.gz) = 22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5 -SIZE (libevent-2.0.21-stable.tar.gz) = 850772 +SHA256 (libevent2-2.0.22.tar.gz) = 24d500180c62e05bc3188f1ca8aebadf2b85ea6f25333931437cbe3010c55d1a +SIZE (libevent2-2.0.22.tar.gz) = 512585 Modified: branches/2015Q1/devel/libevent2/pkg-plist ============================================================================== --- branches/2015Q1/devel/libevent2/pkg-plist Thu Feb 26 15:00:38 2015 (r380010) +++ branches/2015Q1/devel/libevent2/pkg-plist Thu Feb 26 15:02:42 2015 (r380011) @@ -30,23 +30,23 @@ include/evhttp.h include/evrpc.h include/evutil.h lib/libevent-2.0.so.5 -lib/libevent-2.0.so.5.1.9 +lib/libevent-2.0.so.5.1.10 lib/libevent.a lib/libevent.so lib/libevent_core-2.0.so.5 -lib/libevent_core-2.0.so.5.1.9 +lib/libevent_core-2.0.so.5.1.10 lib/libevent_core.a lib/libevent_core.so lib/libevent_extra-2.0.so.5 -lib/libevent_extra-2.0.so.5.1.9 +lib/libevent_extra-2.0.so.5.1.10 lib/libevent_extra.a lib/libevent_extra.so %%OPENSSL%%lib/libevent_openssl-2.0.so.5 -%%OPENSSL%%lib/libevent_openssl-2.0.so.5.1.9 +%%OPENSSL%%lib/libevent_openssl-2.0.so.5.1.10 %%OPENSSL%%lib/libevent_openssl.a %%OPENSSL%%lib/libevent_openssl.so %%THREADS%%lib/libevent_pthreads-2.0.so.5 -%%THREADS%%lib/libevent_pthreads-2.0.so.5.1.9 +%%THREADS%%lib/libevent_pthreads-2.0.so.5.1.10 %%THREADS%%lib/libevent_pthreads.a %%THREADS%%lib/libevent_pthreads.so libdata/pkgconfig/libevent.pc From owner-svn-ports-branches@FreeBSD.ORG Thu Feb 26 15:03:39 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB4C578B; Thu, 26 Feb 2015 15:03:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6920213; Thu, 26 Feb 2015 15:03:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QF3dQi042215; Thu, 26 Feb 2015 15:03:39 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QF3dni042214; Thu, 26 Feb 2015 15:03:39 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201502261503.t1QF3dni042214@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 26 Feb 2015 15:03:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380012 - branches/2015Q1/devel/libevent2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2015 15:03:39 -0000 Author: zi Date: Thu Feb 26 15:03:38 2015 New Revision: 380012 URL: https://svnweb.freebsd.org/changeset/ports/380012 QAT: https://qat.redports.org/buildarchive/r380012/ Log: MFH: r378122 Fix typo that prevents disabling THREADS since r362796 Differential Revision: https://reviews.freebsd.org/D1717 Approved by: portmgr blanket Approved by: ports-secteam With hat: ports-secteam Modified: branches/2015Q1/devel/libevent2/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/libevent2/Makefile ============================================================================== --- branches/2015Q1/devel/libevent2/Makefile Thu Feb 26 15:02:42 2015 (r380011) +++ branches/2015Q1/devel/libevent2/Makefile Thu Feb 26 15:03:38 2015 (r380012) @@ -3,6 +3,7 @@ PORTNAME= libevent2 PORTVERSION= 2.0.22 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mm@FreeBSD.org @@ -32,7 +33,7 @@ OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} OPENSSL_CONFIGURE_ENABLE= openssl -THREADS_CONFIGURE_ENABLE= support +THREADS_CONFIGURE_ENABLE= thread-support post-patch: ${ECHO_CMD} 'AC_CONFIG_MACRO_DIR([m4])' >>${WRKSRC}/configure.in From owner-svn-ports-branches@FreeBSD.ORG Thu Feb 26 15:06:42 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C32249C6; Thu, 26 Feb 2015 15:06:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB39625F; Thu, 26 Feb 2015 15:06:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1QF6gxI043398; Thu, 26 Feb 2015 15:06:42 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1QF6dcM043381; Thu, 26 Feb 2015 15:06:39 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201502261506.t1QF6dcM043381@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 26 Feb 2015 15:06:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380013 - in branches/2015Q1/databases: postgresql90-client postgresql90-contrib postgresql90-server postgresql91-client postgresql91-contrib postgresql91-server postgresql92-client pos... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2015 15:06:42 -0000 Author: zi Date: Thu Feb 26 15:06:39 2015 New Revision: 380013 URL: https://svnweb.freebsd.org/changeset/ports/380013 QAT: https://qat.redports.org/buildarchive/r380013/ Log: MFH: r378500 Update PostgreSQL-9.x to latests versions. This update fixes multiple security issues reported in PostgreSQL over the past few months. All of these issues require prior authentication, and some require additional conditions, and as such are not considered generally urgent. However, users should examine the list of security holes patched below in case they are particularly vulnerable. Security: CVE-2015-0241,CVE-2015-0242,CVE-2015-0243, CVE-2015-0244,CVE-2014-8161 Approved by: ports-secteam With hat: ports-secteam Modified: branches/2015Q1/databases/postgresql90-client/Makefile branches/2015Q1/databases/postgresql90-contrib/Makefile branches/2015Q1/databases/postgresql90-server/Makefile branches/2015Q1/databases/postgresql90-server/distinfo branches/2015Q1/databases/postgresql90-server/pkg-plist-client branches/2015Q1/databases/postgresql90-server/pkg-plist-contrib branches/2015Q1/databases/postgresql90-server/pkg-plist-plperl branches/2015Q1/databases/postgresql90-server/pkg-plist-plpython branches/2015Q1/databases/postgresql90-server/pkg-plist-pltcl branches/2015Q1/databases/postgresql90-server/pkg-plist-server branches/2015Q1/databases/postgresql91-client/Makefile branches/2015Q1/databases/postgresql91-contrib/Makefile branches/2015Q1/databases/postgresql91-server/Makefile branches/2015Q1/databases/postgresql91-server/distinfo branches/2015Q1/databases/postgresql91-server/pkg-plist-client branches/2015Q1/databases/postgresql91-server/pkg-plist-contrib branches/2015Q1/databases/postgresql91-server/pkg-plist-plperl branches/2015Q1/databases/postgresql91-server/pkg-plist-plpython branches/2015Q1/databases/postgresql91-server/pkg-plist-pltcl branches/2015Q1/databases/postgresql91-server/pkg-plist-server branches/2015Q1/databases/postgresql92-client/Makefile branches/2015Q1/databases/postgresql92-contrib/Makefile branches/2015Q1/databases/postgresql92-server/Makefile branches/2015Q1/databases/postgresql92-server/distinfo branches/2015Q1/databases/postgresql92-server/pkg-plist-client branches/2015Q1/databases/postgresql92-server/pkg-plist-contrib branches/2015Q1/databases/postgresql92-server/pkg-plist-plperl branches/2015Q1/databases/postgresql92-server/pkg-plist-plpython branches/2015Q1/databases/postgresql92-server/pkg-plist-pltcl branches/2015Q1/databases/postgresql92-server/pkg-plist-server branches/2015Q1/databases/postgresql93-client/Makefile branches/2015Q1/databases/postgresql93-contrib/Makefile branches/2015Q1/databases/postgresql93-server/Makefile branches/2015Q1/databases/postgresql93-server/distinfo branches/2015Q1/databases/postgresql93-server/pkg-plist-client branches/2015Q1/databases/postgresql93-server/pkg-plist-contrib branches/2015Q1/databases/postgresql93-server/pkg-plist-plperl branches/2015Q1/databases/postgresql93-server/pkg-plist-plpython branches/2015Q1/databases/postgresql93-server/pkg-plist-pltcl branches/2015Q1/databases/postgresql93-server/pkg-plist-server branches/2015Q1/databases/postgresql94-client/Makefile branches/2015Q1/databases/postgresql94-server/Makefile branches/2015Q1/databases/postgresql94-server/distinfo branches/2015Q1/databases/postgresql94-server/pkg-plist-client branches/2015Q1/databases/postgresql94-server/pkg-plist-pltcl branches/2015Q1/databases/postgresql94-server/pkg-plist-server Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/databases/postgresql90-client/Makefile ============================================================================== --- branches/2015Q1/databases/postgresql90-client/Makefile Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-client/Makefile Thu Feb 26 15:06:39 2015 (r380013) @@ -8,6 +8,7 @@ COMMENT= PostgreSQL database (client) MASTERDIR= ${.CURDIR}/../postgresql90-server +LIB_DEPENDS= libedit.so.0:${PORTSDIR}/devel/libedit BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ doc src/makefiles @@ -15,6 +16,6 @@ INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -USES+= readline +CONFIGURE_ARGS+=--with-libedit-preferred .include "${MASTERDIR}/Makefile" Modified: branches/2015Q1/databases/postgresql90-contrib/Makefile ============================================================================== --- branches/2015Q1/databases/postgresql90-contrib/Makefile Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-contrib/Makefile Thu Feb 26 15:06:39 2015 (r380013) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= postgresql -PORTREVISION= 1 CATEGORIES= databases PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} Modified: branches/2015Q1/databases/postgresql90-server/Makefile ============================================================================== --- branches/2015Q1/databases/postgresql90-server/Makefile Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-server/Makefile Thu Feb 26 15:06:39 2015 (r380013) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.0.18 +DISTVERSION?= 9.0.19 PORTREVISION= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} Modified: branches/2015Q1/databases/postgresql90-server/distinfo ============================================================================== --- branches/2015Q1/databases/postgresql90-server/distinfo Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-server/distinfo Thu Feb 26 15:06:39 2015 (r380013) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.0.18.tar.bz2) = 7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003 -SIZE (postgresql/postgresql-9.0.18.tar.bz2) = 14984096 +SHA256 (postgresql/postgresql-9.0.19.tar.bz2) = 53ad12bca99ba8ff0e002e39e50634c4dba1035232be1475cb77b3f6579385c0 +SIZE (postgresql/postgresql-9.0.19.tar.bz2) = 15019406 SHA256 (postgresql/pg-9017-icu-2014-06-09.diff.gz) = a28988885b532e73c2d6e67c6d2d9593f34d4360f2b4c9f6c419a373e16f149f SIZE (postgresql/pg-9017-icu-2014-06-09.diff.gz) = 4395 Modified: branches/2015Q1/databases/postgresql90-server/pkg-plist-client ============================================================================== --- branches/2015Q1/databases/postgresql90-server/pkg-plist-client Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-server/pkg-plist-client Thu Feb 26 15:06:39 2015 (r380013) @@ -476,54 +476,54 @@ include/postgresql/server/windowapi.h include/sqlda-compat.h include/sqlda-native.h include/sqlda.h -@dirrm include/postgresql/server/utils -@dirrm include/postgresql/server/tsearch/dicts -@dirrm include/postgresql/server/tsearch -@dirrm include/postgresql/server/tcop -@dirrm include/postgresql/server/storage -@dirrm include/postgresql/server/snowball/libstemmer -@dirrm include/postgresql/server/snowball -@dirrm include/postgresql/server/rewrite -@dirrm include/postgresql/server/replication -@dirrm include/postgresql/server/regex -@dirrm include/postgresql/server/postmaster -@dirrm include/postgresql/server/portability -@dirrm include/postgresql/server/port/win32_msvc/sys -@dirrm include/postgresql/server/port/win32_msvc -@dirrm include/postgresql/server/port/win32/sys -@dirrm include/postgresql/server/port/win32/netinet -@dirrm include/postgresql/server/port/win32/arpa -@dirrm include/postgresql/server/port/win32 -@dirrm include/postgresql/server/port -@dirrm include/postgresql/server/parser -@dirrm include/postgresql/server/optimizer -@dirrm include/postgresql/server/nodes -@dirrm include/postgresql/server/mb -@dirrm include/postgresql/server/libpq -@dirrm include/postgresql/server/lib -@dirrm include/postgresql/server/foreign -@dirrm include/postgresql/server/executor -@dirrm include/postgresql/server/commands -@dirrm include/postgresql/server/catalog -@dirrm include/postgresql/server/bootstrap -@dirrm include/postgresql/server/access -@dirrm include/postgresql/server +@dir include/postgresql/server/utils +@dir include/postgresql/server/tsearch/dicts +@dir include/postgresql/server/tsearch +@dir include/postgresql/server/tcop +@dir include/postgresql/server/storage +@dir include/postgresql/server/snowball/libstemmer +@dir include/postgresql/server/snowball +@dir include/postgresql/server/rewrite +@dir include/postgresql/server/replication +@dir include/postgresql/server/regex +@dir include/postgresql/server/postmaster +@dir include/postgresql/server/portability +@dir include/postgresql/server/port/win32_msvc/sys +@dir include/postgresql/server/port/win32_msvc +@dir include/postgresql/server/port/win32/sys +@dir include/postgresql/server/port/win32/netinet +@dir include/postgresql/server/port/win32/arpa +@dir include/postgresql/server/port/win32 +@dir include/postgresql/server/port +@dir include/postgresql/server/parser +@dir include/postgresql/server/optimizer +@dir include/postgresql/server/nodes +@dir include/postgresql/server/mb +@dir include/postgresql/server/libpq +@dir include/postgresql/server/lib +@dir include/postgresql/server/foreign +@dir include/postgresql/server/executor +@dir include/postgresql/server/commands +@dir include/postgresql/server/catalog +@dir include/postgresql/server/bootstrap +@dir include/postgresql/server/access +@dir include/postgresql/server include/libpq/libpq-fs.h -@dirrm include/libpq +@dir include/libpq include/postgresql/internal/libpq/pqcomm.h -@dirrm include/postgresql/internal/libpq +@dir include/postgresql/internal/libpq include/postgresql/informix/esql/datetime.h include/postgresql/informix/esql/decimal.h include/postgresql/informix/esql/sqltypes.h -@dirrm include/postgresql/informix/esql -@dirrm include/postgresql/informix +@dir include/postgresql/informix/esql +@dir include/postgresql/informix include/postgresql/internal/c.h include/postgresql/internal/libpq-int.h include/postgresql/internal/postgres_fe.h include/postgresql/internal/port.h include/postgresql/internal/pqexpbuffer.h -@dirrm include/postgresql/internal -@dirrm include/postgresql +@dir include/postgresql/internal +@dir include/postgresql include/ecpg_informix.h include/ecpgerrno.h include/ecpglib.h @@ -559,11 +559,11 @@ lib/postgresql/pgxs/src/Makefile.global lib/postgresql/pgxs/src/Makefile.port lib/postgresql/pgxs/src/Makefile.shlib lib/postgresql/pgxs/src/nls-global.mk -@dirrm lib/postgresql/pgxs/src/makefiles -@dirrm lib/postgresql/pgxs/config -@dirrm lib/postgresql/pgxs/src -@dirrm lib/postgresql/pgxs -@dirrm lib/postgresql +@dir lib/postgresql/pgxs/src/makefiles +@dir lib/postgresql/pgxs/config +@dir lib/postgresql/pgxs/src +@dir lib/postgresql/pgxs +@dir lib/postgresql man/man1/clusterdb.1.gz man/man1/createdb.1.gz man/man1/createlang.1.gz @@ -791,10 +791,10 @@ man/man7/VACUUM.7.gz man/man7/VALUES.7.gz man/man7/WITH.7.gz %%DOCSDIR%%/README-client -@dirrmtry %%DOCSDIR%% -share/postgresql/pg_service.conf.sample -share/postgresql/psqlrc.sample -@dirrmtry share/postgresql +@dir %%DOCSDIR%% +%%DATADIR%%/pg_service.conf.sample +%%DATADIR%%/psqlrc.sample +@dir %%DATADIR%% %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.0.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.0.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.0.mo Modified: branches/2015Q1/databases/postgresql90-server/pkg-plist-contrib ============================================================================== --- branches/2015Q1/databases/postgresql90-server/pkg-plist-contrib Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-server/pkg-plist-contrib Thu Feb 26 15:06:39 2015 (r380013) @@ -51,82 +51,82 @@ lib/postgresql/uuid-ossp.so %%DOCSDIR%%/contrib/moddatetime.example %%DOCSDIR%%/contrib/refint.example %%DOCSDIR%%/contrib/timetravel.example -share/postgresql/contrib/_int.sql -share/postgresql/contrib/adminpack.sql -share/postgresql/contrib/autoinc.sql -share/postgresql/contrib/btree_gin.sql -share/postgresql/contrib/btree_gist.sql -share/postgresql/contrib/chkpass.sql -share/postgresql/contrib/citext.sql -share/postgresql/contrib/cube.sql -share/postgresql/contrib/dblink.sql -share/postgresql/contrib/dict_int.sql -share/postgresql/contrib/dict_xsyn.sql -share/postgresql/contrib/earthdistance.sql -share/postgresql/contrib/fuzzystrmatch.sql -share/postgresql/contrib/hstore.sql -share/postgresql/contrib/insert_username.sql -share/postgresql/contrib/int_aggregate.sql -share/postgresql/contrib/isn.sql -share/postgresql/contrib/lo.sql -share/postgresql/contrib/ltree.sql -share/postgresql/contrib/moddatetime.sql -share/postgresql/contrib/pageinspect.sql -share/postgresql/contrib/pg_buffercache.sql -share/postgresql/contrib/pg_freespacemap.sql -share/postgresql/contrib/pg_stat_statements.sql -share/postgresql/contrib/pg_trgm.sql -share/postgresql/contrib/pgcrypto.sql -share/postgresql/contrib/pgrowlocks.sql -share/postgresql/contrib/pgstattuple.sql -share/postgresql/contrib/pgxml.sql -share/postgresql/contrib/refint.sql -share/postgresql/contrib/seg.sql -share/postgresql/contrib/sslinfo.sql -share/postgresql/contrib/tablefunc.sql -share/postgresql/contrib/test_parser.sql -share/postgresql/contrib/timetravel.sql -share/postgresql/contrib/tsearch2.sql -share/postgresql/contrib/unaccent.sql -share/postgresql/contrib/uninstall_uuid-ossp.sql -share/postgresql/contrib/uuid-ossp.sql -share/postgresql/contrib/uninstall__int.sql -share/postgresql/contrib/uninstall_adminpack.sql -share/postgresql/contrib/uninstall_btree_gin.sql -share/postgresql/contrib/uninstall_btree_gist.sql -share/postgresql/contrib/uninstall_chkpass.sql -share/postgresql/contrib/uninstall_citext.sql -share/postgresql/contrib/uninstall_cube.sql -share/postgresql/contrib/uninstall_dblink.sql -share/postgresql/contrib/uninstall_dict_int.sql -share/postgresql/contrib/uninstall_dict_xsyn.sql -share/postgresql/contrib/uninstall_earthdistance.sql -share/postgresql/contrib/uninstall_fuzzystrmatch.sql -share/postgresql/contrib/uninstall_hstore.sql -share/postgresql/contrib/uninstall_int_aggregate.sql -share/postgresql/contrib/uninstall_isn.sql -share/postgresql/contrib/uninstall_lo.sql -share/postgresql/contrib/uninstall_ltree.sql -share/postgresql/contrib/uninstall_pageinspect.sql -share/postgresql/contrib/uninstall_pg_buffercache.sql -share/postgresql/contrib/uninstall_pg_freespacemap.sql -share/postgresql/contrib/uninstall_pg_stat_statements.sql -share/postgresql/contrib/uninstall_pg_trgm.sql -share/postgresql/contrib/uninstall_pgcrypto.sql -share/postgresql/contrib/uninstall_pgrowlocks.sql -share/postgresql/contrib/uninstall_pgstattuple.sql -share/postgresql/contrib/uninstall_pgxml.sql -share/postgresql/contrib/uninstall_seg.sql -share/postgresql/contrib/uninstall_sslinfo.sql -share/postgresql/contrib/uninstall_tablefunc.sql -share/postgresql/contrib/uninstall_test_parser.sql -share/postgresql/contrib/uninstall_tsearch2.sql -share/postgresql/contrib/uninstall_unaccent.sql -share/postgresql/tsearch_data/unaccent.rules -share/postgresql/tsearch_data/xsyn_sample.rules -@dirrmtry share/postgresql/tsearch_data -@dirrmtry share/postgresql/contrib -@dirrmtry share/postgresql -@dirrmtry %%DOCSDIR%%/contrib -@dirrmtry %%DOCSDIR%% -@dirrmtry lib/postgresql +%%DATADIR%%/contrib/_int.sql +%%DATADIR%%/contrib/adminpack.sql +%%DATADIR%%/contrib/autoinc.sql +%%DATADIR%%/contrib/btree_gin.sql +%%DATADIR%%/contrib/btree_gist.sql +%%DATADIR%%/contrib/chkpass.sql +%%DATADIR%%/contrib/citext.sql +%%DATADIR%%/contrib/cube.sql +%%DATADIR%%/contrib/dblink.sql +%%DATADIR%%/contrib/dict_int.sql +%%DATADIR%%/contrib/dict_xsyn.sql +%%DATADIR%%/contrib/earthdistance.sql +%%DATADIR%%/contrib/fuzzystrmatch.sql +%%DATADIR%%/contrib/hstore.sql +%%DATADIR%%/contrib/insert_username.sql +%%DATADIR%%/contrib/int_aggregate.sql +%%DATADIR%%/contrib/isn.sql +%%DATADIR%%/contrib/lo.sql +%%DATADIR%%/contrib/ltree.sql +%%DATADIR%%/contrib/moddatetime.sql +%%DATADIR%%/contrib/pageinspect.sql +%%DATADIR%%/contrib/pg_buffercache.sql +%%DATADIR%%/contrib/pg_freespacemap.sql +%%DATADIR%%/contrib/pg_stat_statements.sql +%%DATADIR%%/contrib/pg_trgm.sql +%%DATADIR%%/contrib/pgcrypto.sql +%%DATADIR%%/contrib/pgrowlocks.sql +%%DATADIR%%/contrib/pgstattuple.sql +%%DATADIR%%/contrib/pgxml.sql +%%DATADIR%%/contrib/refint.sql +%%DATADIR%%/contrib/seg.sql +%%DATADIR%%/contrib/sslinfo.sql +%%DATADIR%%/contrib/tablefunc.sql +%%DATADIR%%/contrib/test_parser.sql +%%DATADIR%%/contrib/timetravel.sql +%%DATADIR%%/contrib/tsearch2.sql +%%DATADIR%%/contrib/unaccent.sql +%%DATADIR%%/contrib/uninstall_uuid-ossp.sql +%%DATADIR%%/contrib/uuid-ossp.sql +%%DATADIR%%/contrib/uninstall__int.sql +%%DATADIR%%/contrib/uninstall_adminpack.sql +%%DATADIR%%/contrib/uninstall_btree_gin.sql +%%DATADIR%%/contrib/uninstall_btree_gist.sql +%%DATADIR%%/contrib/uninstall_chkpass.sql +%%DATADIR%%/contrib/uninstall_citext.sql +%%DATADIR%%/contrib/uninstall_cube.sql +%%DATADIR%%/contrib/uninstall_dblink.sql +%%DATADIR%%/contrib/uninstall_dict_int.sql +%%DATADIR%%/contrib/uninstall_dict_xsyn.sql +%%DATADIR%%/contrib/uninstall_earthdistance.sql +%%DATADIR%%/contrib/uninstall_fuzzystrmatch.sql +%%DATADIR%%/contrib/uninstall_hstore.sql +%%DATADIR%%/contrib/uninstall_int_aggregate.sql +%%DATADIR%%/contrib/uninstall_isn.sql +%%DATADIR%%/contrib/uninstall_lo.sql +%%DATADIR%%/contrib/uninstall_ltree.sql +%%DATADIR%%/contrib/uninstall_pageinspect.sql +%%DATADIR%%/contrib/uninstall_pg_buffercache.sql +%%DATADIR%%/contrib/uninstall_pg_freespacemap.sql +%%DATADIR%%/contrib/uninstall_pg_stat_statements.sql +%%DATADIR%%/contrib/uninstall_pg_trgm.sql +%%DATADIR%%/contrib/uninstall_pgcrypto.sql +%%DATADIR%%/contrib/uninstall_pgrowlocks.sql +%%DATADIR%%/contrib/uninstall_pgstattuple.sql +%%DATADIR%%/contrib/uninstall_pgxml.sql +%%DATADIR%%/contrib/uninstall_seg.sql +%%DATADIR%%/contrib/uninstall_sslinfo.sql +%%DATADIR%%/contrib/uninstall_tablefunc.sql +%%DATADIR%%/contrib/uninstall_test_parser.sql +%%DATADIR%%/contrib/uninstall_tsearch2.sql +%%DATADIR%%/contrib/uninstall_unaccent.sql +%%DATADIR%%/tsearch_data/unaccent.rules +%%DATADIR%%/tsearch_data/xsyn_sample.rules +@dir %%DATADIR%%/tsearch_data +@dir %%DATADIR%%/contrib +@dir %%DATADIR%% +@dir %%DOCSDIR%%/contrib +@dir %%DOCSDIR%% +@dir lib/postgresql Modified: branches/2015Q1/databases/postgresql90-server/pkg-plist-plperl ============================================================================== --- branches/2015Q1/databases/postgresql90-server/pkg-plist-plperl Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-server/pkg-plist-plperl Thu Feb 26 15:06:39 2015 (r380013) @@ -1,4 +1,4 @@ %%DOCSDIR%%/README-plperl lib/postgresql/plperl.so -@dirrmtry lib/postgresql -@dirrmtry %%DOCSDIR%% +@dir lib/postgresql +@dir %%DOCSDIR%% Modified: branches/2015Q1/databases/postgresql90-server/pkg-plist-plpython ============================================================================== --- branches/2015Q1/databases/postgresql90-server/pkg-plist-plpython Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-server/pkg-plist-plpython Thu Feb 26 15:06:39 2015 (r380013) @@ -1,5 +1,5 @@ %%DOCSDIR%%/README-plpython lib/postgresql/plpython.so lib/postgresql/plpython2.so -@dirrmtry lib/postgresql -@dirrmtry %%DOCSDIR%% +@dir lib/postgresql +@dir %%DOCSDIR%% Modified: branches/2015Q1/databases/postgresql90-server/pkg-plist-pltcl ============================================================================== --- branches/2015Q1/databases/postgresql90-server/pkg-plist-pltcl Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-server/pkg-plist-pltcl Thu Feb 26 15:06:39 2015 (r380013) @@ -1,9 +1,9 @@ %%DOCSDIR%%/README-pltcl lib/postgresql/pltcl.so -@dirrmtry lib/postgresql +@dir lib/postgresql bin/pltcl_loadmod bin/pltcl_delmod bin/pltcl_listmod -share/postgresql/unknown.pltcl -@dirrmtry share/postgresql -@dirrmtry %%DOCSDIR%% +%%DATADIR%%/unknown.pltcl +@dir %%DATADIR%% +@dir %%DOCSDIR%% Modified: branches/2015Q1/databases/postgresql90-server/pkg-plist-server ============================================================================== --- branches/2015Q1/databases/postgresql90-server/pkg-plist-server Thu Feb 26 15:03:38 2015 (r380012) +++ branches/2015Q1/databases/postgresql90-server/pkg-plist-server Thu Feb 26 15:06:39 2015 (r380013) @@ -35,17 +35,17 @@ lib/postgresql/utf8_and_sjis2004.so lib/postgresql/utf8_and_uhc.so lib/postgresql/utf8_and_win.so %%DOCSDIR%%/README-server -@dirrmtry %%DOCSDIR%% -share/postgresql/conversion_create.sql -share/postgresql/information_schema.sql -share/postgresql/pg_hba.conf.sample -share/postgresql/pg_ident.conf.sample -share/postgresql/postgres.bki -share/postgresql/postgres.description -share/postgresql/postgresql.conf.sample -share/postgresql/recovery.conf.sample -share/postgresql/sql_features.txt -share/postgresql/system_views.sql +@dir %%DOCSDIR%% +%%DATADIR%%/conversion_create.sql +%%DATADIR%%/information_schema.sql +%%DATADIR%%/pg_hba.conf.sample +%%DATADIR%%/pg_ident.conf.sample +%%DATADIR%%/postgres.bki +%%DATADIR%%/postgres.description +%%DATADIR%%/postgresql.conf.sample +%%DATADIR%%/recovery.conf.sample +%%DATADIR%%/sql_features.txt +%%DATADIR%%/system_views.sql %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.0.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata-9.0.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl-9.0.mo @@ -135,648 +135,651 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-9.0.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/plpgsql-9.0.mo %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres-9.0.mo -share/postgresql/postgres.shdescription -share/postgresql/snowball_create.sql -%%TZDATA%%share/postgresql/timezone/Africa/Abidjan -%%TZDATA%%share/postgresql/timezone/Africa/Accra -%%TZDATA%%share/postgresql/timezone/Africa/Addis_Ababa -%%TZDATA%%share/postgresql/timezone/Africa/Algiers -%%TZDATA%%share/postgresql/timezone/Africa/Asmara -%%TZDATA%%share/postgresql/timezone/Africa/Asmera -%%TZDATA%%share/postgresql/timezone/Africa/Bamako -%%TZDATA%%share/postgresql/timezone/Africa/Bangui -%%TZDATA%%share/postgresql/timezone/Africa/Banjul -%%TZDATA%%share/postgresql/timezone/Africa/Bissau -%%TZDATA%%share/postgresql/timezone/Africa/Blantyre -%%TZDATA%%share/postgresql/timezone/Africa/Brazzaville -%%TZDATA%%share/postgresql/timezone/Africa/Bujumbura -%%TZDATA%%share/postgresql/timezone/Africa/Cairo -%%TZDATA%%share/postgresql/timezone/Africa/Casablanca -%%TZDATA%%share/postgresql/timezone/Africa/Ceuta -%%TZDATA%%share/postgresql/timezone/Africa/Conakry -%%TZDATA%%share/postgresql/timezone/Africa/Dakar -%%TZDATA%%share/postgresql/timezone/Africa/Dar_es_Salaam -%%TZDATA%%share/postgresql/timezone/Africa/Djibouti -%%TZDATA%%share/postgresql/timezone/Africa/Douala -%%TZDATA%%share/postgresql/timezone/Africa/El_Aaiun -%%TZDATA%%share/postgresql/timezone/Africa/Freetown -%%TZDATA%%share/postgresql/timezone/Africa/Gaborone -%%TZDATA%%share/postgresql/timezone/Africa/Harare -%%TZDATA%%share/postgresql/timezone/Africa/Johannesburg -%%TZDATA%%share/postgresql/timezone/Africa/Juba -%%TZDATA%%share/postgresql/timezone/Africa/Kampala -%%TZDATA%%share/postgresql/timezone/Africa/Khartoum -%%TZDATA%%share/postgresql/timezone/Africa/Kigali -%%TZDATA%%share/postgresql/timezone/Africa/Kinshasa -%%TZDATA%%share/postgresql/timezone/Africa/Lagos -%%TZDATA%%share/postgresql/timezone/Africa/Libreville -%%TZDATA%%share/postgresql/timezone/Africa/Lome -%%TZDATA%%share/postgresql/timezone/Africa/Luanda -%%TZDATA%%share/postgresql/timezone/Africa/Lubumbashi -%%TZDATA%%share/postgresql/timezone/Africa/Lusaka -%%TZDATA%%share/postgresql/timezone/Africa/Malabo -%%TZDATA%%share/postgresql/timezone/Africa/Maputo -%%TZDATA%%share/postgresql/timezone/Africa/Maseru -%%TZDATA%%share/postgresql/timezone/Africa/Mbabane -%%TZDATA%%share/postgresql/timezone/Africa/Mogadishu -%%TZDATA%%share/postgresql/timezone/Africa/Monrovia -%%TZDATA%%share/postgresql/timezone/Africa/Nairobi -%%TZDATA%%share/postgresql/timezone/Africa/Ndjamena -%%TZDATA%%share/postgresql/timezone/Africa/Niamey -%%TZDATA%%share/postgresql/timezone/Africa/Nouakchott -%%TZDATA%%share/postgresql/timezone/Africa/Ouagadougou -%%TZDATA%%share/postgresql/timezone/Africa/Porto-Novo -%%TZDATA%%share/postgresql/timezone/Africa/Sao_Tome -%%TZDATA%%share/postgresql/timezone/Africa/Timbuktu -%%TZDATA%%share/postgresql/timezone/Africa/Tripoli -%%TZDATA%%share/postgresql/timezone/Africa/Tunis -%%TZDATA%%share/postgresql/timezone/Africa/Windhoek -%%TZDATA%%share/postgresql/timezone/America/Adak -%%TZDATA%%share/postgresql/timezone/America/Anchorage -%%TZDATA%%share/postgresql/timezone/America/Anguilla -%%TZDATA%%share/postgresql/timezone/America/Antigua -%%TZDATA%%share/postgresql/timezone/America/Araguaina -%%TZDATA%%share/postgresql/timezone/America/Argentina/Buenos_Aires -%%TZDATA%%share/postgresql/timezone/America/Argentina/Catamarca -%%TZDATA%%share/postgresql/timezone/America/Argentina/ComodRivadavia -%%TZDATA%%share/postgresql/timezone/America/Argentina/Cordoba -%%TZDATA%%share/postgresql/timezone/America/Argentina/Jujuy -%%TZDATA%%share/postgresql/timezone/America/Argentina/La_Rioja -%%TZDATA%%share/postgresql/timezone/America/Argentina/Mendoza -%%TZDATA%%share/postgresql/timezone/America/Argentina/Rio_Gallegos -%%TZDATA%%share/postgresql/timezone/America/Argentina/Salta -%%TZDATA%%share/postgresql/timezone/America/Argentina/San_Juan -%%TZDATA%%share/postgresql/timezone/America/Argentina/San_Luis -%%TZDATA%%share/postgresql/timezone/America/Argentina/Tucuman -%%TZDATA%%share/postgresql/timezone/America/Argentina/Ushuaia -%%TZDATA%%share/postgresql/timezone/America/Aruba -%%TZDATA%%share/postgresql/timezone/America/Asuncion -%%TZDATA%%share/postgresql/timezone/America/Atikokan -%%TZDATA%%share/postgresql/timezone/America/Atka -%%TZDATA%%share/postgresql/timezone/America/Bahia -%%TZDATA%%share/postgresql/timezone/America/Bahia_Banderas -%%TZDATA%%share/postgresql/timezone/America/Barbados -%%TZDATA%%share/postgresql/timezone/America/Belem -%%TZDATA%%share/postgresql/timezone/America/Belize -%%TZDATA%%share/postgresql/timezone/America/Blanc-Sablon -%%TZDATA%%share/postgresql/timezone/America/Boa_Vista -%%TZDATA%%share/postgresql/timezone/America/Bogota -%%TZDATA%%share/postgresql/timezone/America/Boise -%%TZDATA%%share/postgresql/timezone/America/Buenos_Aires -%%TZDATA%%share/postgresql/timezone/America/Cambridge_Bay -%%TZDATA%%share/postgresql/timezone/America/Campo_Grande -%%TZDATA%%share/postgresql/timezone/America/Cancun -%%TZDATA%%share/postgresql/timezone/America/Caracas -%%TZDATA%%share/postgresql/timezone/America/Catamarca -%%TZDATA%%share/postgresql/timezone/America/Cayenne -%%TZDATA%%share/postgresql/timezone/America/Cayman -%%TZDATA%%share/postgresql/timezone/America/Chicago -%%TZDATA%%share/postgresql/timezone/America/Chihuahua -%%TZDATA%%share/postgresql/timezone/America/Coral_Harbour -%%TZDATA%%share/postgresql/timezone/America/Cordoba -%%TZDATA%%share/postgresql/timezone/America/Costa_Rica -%%TZDATA%%share/postgresql/timezone/America/Creston -%%TZDATA%%share/postgresql/timezone/America/Cuiaba -%%TZDATA%%share/postgresql/timezone/America/Curacao -%%TZDATA%%share/postgresql/timezone/America/Danmarkshavn -%%TZDATA%%share/postgresql/timezone/America/Dawson -%%TZDATA%%share/postgresql/timezone/America/Dawson_Creek -%%TZDATA%%share/postgresql/timezone/America/Denver -%%TZDATA%%share/postgresql/timezone/America/Detroit -%%TZDATA%%share/postgresql/timezone/America/Dominica -%%TZDATA%%share/postgresql/timezone/America/Edmonton -%%TZDATA%%share/postgresql/timezone/America/Eirunepe -%%TZDATA%%share/postgresql/timezone/America/El_Salvador -%%TZDATA%%share/postgresql/timezone/America/Ensenada -%%TZDATA%%share/postgresql/timezone/America/Fort_Wayne -%%TZDATA%%share/postgresql/timezone/America/Fortaleza -%%TZDATA%%share/postgresql/timezone/America/Glace_Bay -%%TZDATA%%share/postgresql/timezone/America/Godthab -%%TZDATA%%share/postgresql/timezone/America/Goose_Bay -%%TZDATA%%share/postgresql/timezone/America/Grand_Turk -%%TZDATA%%share/postgresql/timezone/America/Grenada -%%TZDATA%%share/postgresql/timezone/America/Guadeloupe -%%TZDATA%%share/postgresql/timezone/America/Guatemala -%%TZDATA%%share/postgresql/timezone/America/Guayaquil -%%TZDATA%%share/postgresql/timezone/America/Guyana -%%TZDATA%%share/postgresql/timezone/America/Halifax -%%TZDATA%%share/postgresql/timezone/America/Havana -%%TZDATA%%share/postgresql/timezone/America/Hermosillo -%%TZDATA%%share/postgresql/timezone/America/Indiana/Indianapolis -%%TZDATA%%share/postgresql/timezone/America/Indiana/Knox -%%TZDATA%%share/postgresql/timezone/America/Indiana/Marengo -%%TZDATA%%share/postgresql/timezone/America/Indiana/Petersburg -%%TZDATA%%share/postgresql/timezone/America/Indiana/Tell_City -%%TZDATA%%share/postgresql/timezone/America/Indiana/Vevay -%%TZDATA%%share/postgresql/timezone/America/Indiana/Vincennes -%%TZDATA%%share/postgresql/timezone/America/Indiana/Winamac -%%TZDATA%%share/postgresql/timezone/America/Indianapolis -%%TZDATA%%share/postgresql/timezone/America/Inuvik -%%TZDATA%%share/postgresql/timezone/America/Iqaluit -%%TZDATA%%share/postgresql/timezone/America/Jamaica -%%TZDATA%%share/postgresql/timezone/America/Jujuy -%%TZDATA%%share/postgresql/timezone/America/Juneau -%%TZDATA%%share/postgresql/timezone/America/Kentucky/Louisville -%%TZDATA%%share/postgresql/timezone/America/Kentucky/Monticello -%%TZDATA%%share/postgresql/timezone/America/Knox_IN -%%TZDATA%%share/postgresql/timezone/America/Kralendijk -%%TZDATA%%share/postgresql/timezone/America/La_Paz -%%TZDATA%%share/postgresql/timezone/America/Lima -%%TZDATA%%share/postgresql/timezone/America/Los_Angeles -%%TZDATA%%share/postgresql/timezone/America/Louisville -%%TZDATA%%share/postgresql/timezone/America/Lower_Princes -%%TZDATA%%share/postgresql/timezone/America/Maceio -%%TZDATA%%share/postgresql/timezone/America/Managua -%%TZDATA%%share/postgresql/timezone/America/Manaus -%%TZDATA%%share/postgresql/timezone/America/Marigot -%%TZDATA%%share/postgresql/timezone/America/Martinique -%%TZDATA%%share/postgresql/timezone/America/Matamoros -%%TZDATA%%share/postgresql/timezone/America/Mazatlan -%%TZDATA%%share/postgresql/timezone/America/Mendoza -%%TZDATA%%share/postgresql/timezone/America/Menominee -%%TZDATA%%share/postgresql/timezone/America/Merida -%%TZDATA%%share/postgresql/timezone/America/Metlakatla -%%TZDATA%%share/postgresql/timezone/America/Mexico_City -%%TZDATA%%share/postgresql/timezone/America/Miquelon -%%TZDATA%%share/postgresql/timezone/America/Moncton -%%TZDATA%%share/postgresql/timezone/America/Monterrey -%%TZDATA%%share/postgresql/timezone/America/Montevideo -%%TZDATA%%share/postgresql/timezone/America/Montreal -%%TZDATA%%share/postgresql/timezone/America/Montserrat -%%TZDATA%%share/postgresql/timezone/America/Nassau -%%TZDATA%%share/postgresql/timezone/America/New_York -%%TZDATA%%share/postgresql/timezone/America/Nipigon -%%TZDATA%%share/postgresql/timezone/America/Nome -%%TZDATA%%share/postgresql/timezone/America/Noronha -%%TZDATA%%share/postgresql/timezone/America/North_Dakota/Beulah -%%TZDATA%%share/postgresql/timezone/America/North_Dakota/Center -%%TZDATA%%share/postgresql/timezone/America/North_Dakota/New_Salem -%%TZDATA%%share/postgresql/timezone/America/Ojinaga -%%TZDATA%%share/postgresql/timezone/America/Panama -%%TZDATA%%share/postgresql/timezone/America/Pangnirtung -%%TZDATA%%share/postgresql/timezone/America/Paramaribo -%%TZDATA%%share/postgresql/timezone/America/Phoenix -%%TZDATA%%share/postgresql/timezone/America/Port-au-Prince -%%TZDATA%%share/postgresql/timezone/America/Port_of_Spain -%%TZDATA%%share/postgresql/timezone/America/Porto_Acre -%%TZDATA%%share/postgresql/timezone/America/Porto_Velho -%%TZDATA%%share/postgresql/timezone/America/Puerto_Rico -%%TZDATA%%share/postgresql/timezone/America/Rainy_River -%%TZDATA%%share/postgresql/timezone/America/Rankin_Inlet -%%TZDATA%%share/postgresql/timezone/America/Recife -%%TZDATA%%share/postgresql/timezone/America/Regina -%%TZDATA%%share/postgresql/timezone/America/Resolute -%%TZDATA%%share/postgresql/timezone/America/Rio_Branco -%%TZDATA%%share/postgresql/timezone/America/Rosario -%%TZDATA%%share/postgresql/timezone/America/Santa_Isabel -%%TZDATA%%share/postgresql/timezone/America/Santarem -%%TZDATA%%share/postgresql/timezone/America/Santiago -%%TZDATA%%share/postgresql/timezone/America/Santo_Domingo -%%TZDATA%%share/postgresql/timezone/America/Sao_Paulo -%%TZDATA%%share/postgresql/timezone/America/Scoresbysund -%%TZDATA%%share/postgresql/timezone/America/Shiprock -%%TZDATA%%share/postgresql/timezone/America/Sitka -%%TZDATA%%share/postgresql/timezone/America/St_Barthelemy -%%TZDATA%%share/postgresql/timezone/America/St_Johns -%%TZDATA%%share/postgresql/timezone/America/St_Kitts -%%TZDATA%%share/postgresql/timezone/America/St_Lucia -%%TZDATA%%share/postgresql/timezone/America/St_Thomas -%%TZDATA%%share/postgresql/timezone/America/St_Vincent -%%TZDATA%%share/postgresql/timezone/America/Swift_Current -%%TZDATA%%share/postgresql/timezone/America/Tegucigalpa -%%TZDATA%%share/postgresql/timezone/America/Thule -%%TZDATA%%share/postgresql/timezone/America/Thunder_Bay -%%TZDATA%%share/postgresql/timezone/America/Tijuana -%%TZDATA%%share/postgresql/timezone/America/Toronto -%%TZDATA%%share/postgresql/timezone/America/Tortola -%%TZDATA%%share/postgresql/timezone/America/Vancouver -%%TZDATA%%share/postgresql/timezone/America/Virgin -%%TZDATA%%share/postgresql/timezone/America/Whitehorse -%%TZDATA%%share/postgresql/timezone/America/Winnipeg -%%TZDATA%%share/postgresql/timezone/America/Yakutat -%%TZDATA%%share/postgresql/timezone/America/Yellowknife -%%TZDATA%%share/postgresql/timezone/Antarctica/Casey -%%TZDATA%%share/postgresql/timezone/Antarctica/Davis -%%TZDATA%%share/postgresql/timezone/Antarctica/DumontDUrville -%%TZDATA%%share/postgresql/timezone/Antarctica/Macquarie -%%TZDATA%%share/postgresql/timezone/Antarctica/Mawson -%%TZDATA%%share/postgresql/timezone/Antarctica/McMurdo -%%TZDATA%%share/postgresql/timezone/Antarctica/Palmer -%%TZDATA%%share/postgresql/timezone/Antarctica/Rothera -%%TZDATA%%share/postgresql/timezone/Antarctica/South_Pole -%%TZDATA%%share/postgresql/timezone/Antarctica/Syowa -%%TZDATA%%share/postgresql/timezone/Antarctica/Troll -%%TZDATA%%share/postgresql/timezone/Antarctica/Vostok -%%TZDATA%%share/postgresql/timezone/Arctic/Longyearbyen -%%TZDATA%%share/postgresql/timezone/Asia/Aden -%%TZDATA%%share/postgresql/timezone/Asia/Almaty -%%TZDATA%%share/postgresql/timezone/Asia/Amman -%%TZDATA%%share/postgresql/timezone/Asia/Anadyr -%%TZDATA%%share/postgresql/timezone/Asia/Aqtau -%%TZDATA%%share/postgresql/timezone/Asia/Aqtobe -%%TZDATA%%share/postgresql/timezone/Asia/Ashgabat -%%TZDATA%%share/postgresql/timezone/Asia/Ashkhabad -%%TZDATA%%share/postgresql/timezone/Asia/Baghdad -%%TZDATA%%share/postgresql/timezone/Asia/Bahrain -%%TZDATA%%share/postgresql/timezone/Asia/Baku -%%TZDATA%%share/postgresql/timezone/Asia/Bangkok -%%TZDATA%%share/postgresql/timezone/Asia/Beirut -%%TZDATA%%share/postgresql/timezone/Asia/Bishkek -%%TZDATA%%share/postgresql/timezone/Asia/Brunei -%%TZDATA%%share/postgresql/timezone/Asia/Calcutta -%%TZDATA%%share/postgresql/timezone/Asia/Choibalsan -%%TZDATA%%share/postgresql/timezone/Asia/Chongqing -%%TZDATA%%share/postgresql/timezone/Asia/Chungking -%%TZDATA%%share/postgresql/timezone/Asia/Colombo -%%TZDATA%%share/postgresql/timezone/Asia/Dacca -%%TZDATA%%share/postgresql/timezone/Asia/Damascus -%%TZDATA%%share/postgresql/timezone/Asia/Dhaka -%%TZDATA%%share/postgresql/timezone/Asia/Dili -%%TZDATA%%share/postgresql/timezone/Asia/Dubai -%%TZDATA%%share/postgresql/timezone/Asia/Dushanbe -%%TZDATA%%share/postgresql/timezone/Asia/Gaza -%%TZDATA%%share/postgresql/timezone/Asia/Harbin -%%TZDATA%%share/postgresql/timezone/Asia/Hebron -%%TZDATA%%share/postgresql/timezone/Asia/Ho_Chi_Minh -%%TZDATA%%share/postgresql/timezone/Asia/Hong_Kong -%%TZDATA%%share/postgresql/timezone/Asia/Hovd -%%TZDATA%%share/postgresql/timezone/Asia/Irkutsk -%%TZDATA%%share/postgresql/timezone/Asia/Istanbul -%%TZDATA%%share/postgresql/timezone/Asia/Jakarta -%%TZDATA%%share/postgresql/timezone/Asia/Jayapura -%%TZDATA%%share/postgresql/timezone/Asia/Jerusalem -%%TZDATA%%share/postgresql/timezone/Asia/Kabul -%%TZDATA%%share/postgresql/timezone/Asia/Kamchatka -%%TZDATA%%share/postgresql/timezone/Asia/Karachi -%%TZDATA%%share/postgresql/timezone/Asia/Kashgar -%%TZDATA%%share/postgresql/timezone/Asia/Kathmandu -%%TZDATA%%share/postgresql/timezone/Asia/Katmandu -%%TZDATA%%share/postgresql/timezone/Asia/Khandyga -%%TZDATA%%share/postgresql/timezone/Asia/Kolkata -%%TZDATA%%share/postgresql/timezone/Asia/Krasnoyarsk -%%TZDATA%%share/postgresql/timezone/Asia/Kuala_Lumpur -%%TZDATA%%share/postgresql/timezone/Asia/Kuching -%%TZDATA%%share/postgresql/timezone/Asia/Kuwait -%%TZDATA%%share/postgresql/timezone/Asia/Macao -%%TZDATA%%share/postgresql/timezone/Asia/Macau -%%TZDATA%%share/postgresql/timezone/Asia/Magadan -%%TZDATA%%share/postgresql/timezone/Asia/Makassar -%%TZDATA%%share/postgresql/timezone/Asia/Manila -%%TZDATA%%share/postgresql/timezone/Asia/Muscat -%%TZDATA%%share/postgresql/timezone/Asia/Nicosia -%%TZDATA%%share/postgresql/timezone/Asia/Novokuznetsk -%%TZDATA%%share/postgresql/timezone/Asia/Novosibirsk -%%TZDATA%%share/postgresql/timezone/Asia/Omsk -%%TZDATA%%share/postgresql/timezone/Asia/Oral -%%TZDATA%%share/postgresql/timezone/Asia/Phnom_Penh -%%TZDATA%%share/postgresql/timezone/Asia/Pontianak -%%TZDATA%%share/postgresql/timezone/Asia/Pyongyang -%%TZDATA%%share/postgresql/timezone/Asia/Qatar -%%TZDATA%%share/postgresql/timezone/Asia/Qyzylorda -%%TZDATA%%share/postgresql/timezone/Asia/Rangoon -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh -%%TZDATA%%share/postgresql/timezone/Asia/Saigon -%%TZDATA%%share/postgresql/timezone/Asia/Sakhalin -%%TZDATA%%share/postgresql/timezone/Asia/Samarkand -%%TZDATA%%share/postgresql/timezone/Asia/Seoul -%%TZDATA%%share/postgresql/timezone/Asia/Shanghai -%%TZDATA%%share/postgresql/timezone/Asia/Singapore -%%TZDATA%%share/postgresql/timezone/Asia/Taipei -%%TZDATA%%share/postgresql/timezone/Asia/Tashkent -%%TZDATA%%share/postgresql/timezone/Asia/Tbilisi -%%TZDATA%%share/postgresql/timezone/Asia/Tehran -%%TZDATA%%share/postgresql/timezone/Asia/Tel_Aviv -%%TZDATA%%share/postgresql/timezone/Asia/Thimbu -%%TZDATA%%share/postgresql/timezone/Asia/Thimphu -%%TZDATA%%share/postgresql/timezone/Asia/Tokyo -%%TZDATA%%share/postgresql/timezone/Asia/Ujung_Pandang -%%TZDATA%%share/postgresql/timezone/Asia/Ulaanbaatar -%%TZDATA%%share/postgresql/timezone/Asia/Ulan_Bator -%%TZDATA%%share/postgresql/timezone/Asia/Urumqi -%%TZDATA%%share/postgresql/timezone/Asia/Ust-Nera -%%TZDATA%%share/postgresql/timezone/Asia/Vientiane -%%TZDATA%%share/postgresql/timezone/Asia/Vladivostok -%%TZDATA%%share/postgresql/timezone/Asia/Yakutsk -%%TZDATA%%share/postgresql/timezone/Asia/Yekaterinburg -%%TZDATA%%share/postgresql/timezone/Asia/Yerevan -%%TZDATA%%share/postgresql/timezone/Atlantic/Azores -%%TZDATA%%share/postgresql/timezone/Atlantic/Bermuda -%%TZDATA%%share/postgresql/timezone/Atlantic/Canary -%%TZDATA%%share/postgresql/timezone/Atlantic/Cape_Verde -%%TZDATA%%share/postgresql/timezone/Atlantic/Faeroe -%%TZDATA%%share/postgresql/timezone/Atlantic/Faroe -%%TZDATA%%share/postgresql/timezone/Atlantic/Jan_Mayen -%%TZDATA%%share/postgresql/timezone/Atlantic/Madeira -%%TZDATA%%share/postgresql/timezone/Atlantic/Reykjavik -%%TZDATA%%share/postgresql/timezone/Atlantic/South_Georgia -%%TZDATA%%share/postgresql/timezone/Atlantic/St_Helena -%%TZDATA%%share/postgresql/timezone/Atlantic/Stanley -%%TZDATA%%share/postgresql/timezone/Australia/ACT -%%TZDATA%%share/postgresql/timezone/Australia/Adelaide -%%TZDATA%%share/postgresql/timezone/Australia/Brisbane -%%TZDATA%%share/postgresql/timezone/Australia/Broken_Hill -%%TZDATA%%share/postgresql/timezone/Australia/Canberra -%%TZDATA%%share/postgresql/timezone/Australia/Currie -%%TZDATA%%share/postgresql/timezone/Australia/Darwin -%%TZDATA%%share/postgresql/timezone/Australia/Eucla -%%TZDATA%%share/postgresql/timezone/Australia/Hobart -%%TZDATA%%share/postgresql/timezone/Australia/LHI -%%TZDATA%%share/postgresql/timezone/Australia/Lindeman -%%TZDATA%%share/postgresql/timezone/Australia/Lord_Howe -%%TZDATA%%share/postgresql/timezone/Australia/Melbourne -%%TZDATA%%share/postgresql/timezone/Australia/NSW -%%TZDATA%%share/postgresql/timezone/Australia/North -%%TZDATA%%share/postgresql/timezone/Australia/Perth -%%TZDATA%%share/postgresql/timezone/Australia/Queensland -%%TZDATA%%share/postgresql/timezone/Australia/South -%%TZDATA%%share/postgresql/timezone/Australia/Sydney -%%TZDATA%%share/postgresql/timezone/Australia/Tasmania -%%TZDATA%%share/postgresql/timezone/Australia/Victoria -%%TZDATA%%share/postgresql/timezone/Australia/West -%%TZDATA%%share/postgresql/timezone/Australia/Yancowinna -%%TZDATA%%share/postgresql/timezone/Brazil/Acre -%%TZDATA%%share/postgresql/timezone/Brazil/DeNoronha -%%TZDATA%%share/postgresql/timezone/Brazil/East -%%TZDATA%%share/postgresql/timezone/Brazil/West -%%TZDATA%%share/postgresql/timezone/CET -%%TZDATA%%share/postgresql/timezone/CST6CDT -%%TZDATA%%share/postgresql/timezone/Canada/Atlantic -%%TZDATA%%share/postgresql/timezone/Canada/Central -%%TZDATA%%share/postgresql/timezone/Canada/East-Saskatchewan -%%TZDATA%%share/postgresql/timezone/Canada/Eastern -%%TZDATA%%share/postgresql/timezone/Canada/Mountain -%%TZDATA%%share/postgresql/timezone/Canada/Newfoundland -%%TZDATA%%share/postgresql/timezone/Canada/Pacific -%%TZDATA%%share/postgresql/timezone/Canada/Saskatchewan -%%TZDATA%%share/postgresql/timezone/Canada/Yukon -%%TZDATA%%share/postgresql/timezone/Chile/Continental -%%TZDATA%%share/postgresql/timezone/Chile/EasterIsland -%%TZDATA%%share/postgresql/timezone/Cuba -%%TZDATA%%share/postgresql/timezone/EET -%%TZDATA%%share/postgresql/timezone/EST -%%TZDATA%%share/postgresql/timezone/EST5EDT -%%TZDATA%%share/postgresql/timezone/Egypt -%%TZDATA%%share/postgresql/timezone/Eire -%%TZDATA%%share/postgresql/timezone/Etc/GMT -%%TZDATA%%share/postgresql/timezone/Etc/GMT+0 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+1 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+10 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+11 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+12 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+2 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+3 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+4 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+5 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+6 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+7 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+8 -%%TZDATA%%share/postgresql/timezone/Etc/GMT+9 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-0 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-1 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-10 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-11 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-12 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-13 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-14 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-2 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-3 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-4 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-5 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-6 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-7 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-8 -%%TZDATA%%share/postgresql/timezone/Etc/GMT-9 -%%TZDATA%%share/postgresql/timezone/Etc/GMT0 -%%TZDATA%%share/postgresql/timezone/Etc/Greenwich -%%TZDATA%%share/postgresql/timezone/Etc/UCT -%%TZDATA%%share/postgresql/timezone/Etc/UTC -%%TZDATA%%share/postgresql/timezone/Etc/Universal -%%TZDATA%%share/postgresql/timezone/Etc/Zulu -%%TZDATA%%share/postgresql/timezone/Europe/Amsterdam -%%TZDATA%%share/postgresql/timezone/Europe/Andorra -%%TZDATA%%share/postgresql/timezone/Europe/Athens -%%TZDATA%%share/postgresql/timezone/Europe/Belfast -%%TZDATA%%share/postgresql/timezone/Europe/Belgrade -%%TZDATA%%share/postgresql/timezone/Europe/Berlin -%%TZDATA%%share/postgresql/timezone/Europe/Bratislava -%%TZDATA%%share/postgresql/timezone/Europe/Brussels -%%TZDATA%%share/postgresql/timezone/Europe/Bucharest -%%TZDATA%%share/postgresql/timezone/Europe/Budapest -%%TZDATA%%share/postgresql/timezone/Europe/Busingen -%%TZDATA%%share/postgresql/timezone/Europe/Chisinau -%%TZDATA%%share/postgresql/timezone/Europe/Copenhagen -%%TZDATA%%share/postgresql/timezone/Europe/Dublin -%%TZDATA%%share/postgresql/timezone/Europe/Gibraltar -%%TZDATA%%share/postgresql/timezone/Europe/Guernsey -%%TZDATA%%share/postgresql/timezone/Europe/Helsinki -%%TZDATA%%share/postgresql/timezone/Europe/Isle_of_Man -%%TZDATA%%share/postgresql/timezone/Europe/Istanbul -%%TZDATA%%share/postgresql/timezone/Europe/Jersey -%%TZDATA%%share/postgresql/timezone/Europe/Kaliningrad -%%TZDATA%%share/postgresql/timezone/Europe/Kiev -%%TZDATA%%share/postgresql/timezone/Europe/Lisbon -%%TZDATA%%share/postgresql/timezone/Europe/Ljubljana -%%TZDATA%%share/postgresql/timezone/Europe/London -%%TZDATA%%share/postgresql/timezone/Europe/Luxembourg -%%TZDATA%%share/postgresql/timezone/Europe/Madrid -%%TZDATA%%share/postgresql/timezone/Europe/Malta -%%TZDATA%%share/postgresql/timezone/Europe/Mariehamn -%%TZDATA%%share/postgresql/timezone/Europe/Minsk -%%TZDATA%%share/postgresql/timezone/Europe/Monaco -%%TZDATA%%share/postgresql/timezone/Europe/Moscow -%%TZDATA%%share/postgresql/timezone/Europe/Nicosia -%%TZDATA%%share/postgresql/timezone/Europe/Oslo -%%TZDATA%%share/postgresql/timezone/Europe/Paris -%%TZDATA%%share/postgresql/timezone/Europe/Podgorica -%%TZDATA%%share/postgresql/timezone/Europe/Prague -%%TZDATA%%share/postgresql/timezone/Europe/Riga -%%TZDATA%%share/postgresql/timezone/Europe/Rome -%%TZDATA%%share/postgresql/timezone/Europe/Samara -%%TZDATA%%share/postgresql/timezone/Europe/San_Marino -%%TZDATA%%share/postgresql/timezone/Europe/Sarajevo -%%TZDATA%%share/postgresql/timezone/Europe/Simferopol -%%TZDATA%%share/postgresql/timezone/Europe/Skopje -%%TZDATA%%share/postgresql/timezone/Europe/Sofia -%%TZDATA%%share/postgresql/timezone/Europe/Stockholm -%%TZDATA%%share/postgresql/timezone/Europe/Tallinn -%%TZDATA%%share/postgresql/timezone/Europe/Tirane -%%TZDATA%%share/postgresql/timezone/Europe/Tiraspol -%%TZDATA%%share/postgresql/timezone/Europe/Uzhgorod -%%TZDATA%%share/postgresql/timezone/Europe/Vaduz -%%TZDATA%%share/postgresql/timezone/Europe/Vatican -%%TZDATA%%share/postgresql/timezone/Europe/Vienna -%%TZDATA%%share/postgresql/timezone/Europe/Vilnius -%%TZDATA%%share/postgresql/timezone/Europe/Volgograd -%%TZDATA%%share/postgresql/timezone/Europe/Warsaw -%%TZDATA%%share/postgresql/timezone/Europe/Zagreb -%%TZDATA%%share/postgresql/timezone/Europe/Zaporozhye -%%TZDATA%%share/postgresql/timezone/Europe/Zurich -%%TZDATA%%share/postgresql/timezone/Factory -%%TZDATA%%share/postgresql/timezone/GB -%%TZDATA%%share/postgresql/timezone/GB-Eire -%%TZDATA%%share/postgresql/timezone/GMT -%%TZDATA%%share/postgresql/timezone/GMT+0 -%%TZDATA%%share/postgresql/timezone/GMT-0 -%%TZDATA%%share/postgresql/timezone/GMT0 -%%TZDATA%%share/postgresql/timezone/Greenwich -%%TZDATA%%share/postgresql/timezone/HST -%%TZDATA%%share/postgresql/timezone/Hongkong -%%TZDATA%%share/postgresql/timezone/Iceland -%%TZDATA%%share/postgresql/timezone/Indian/Antananarivo -%%TZDATA%%share/postgresql/timezone/Indian/Chagos -%%TZDATA%%share/postgresql/timezone/Indian/Christmas -%%TZDATA%%share/postgresql/timezone/Indian/Cocos -%%TZDATA%%share/postgresql/timezone/Indian/Comoro -%%TZDATA%%share/postgresql/timezone/Indian/Kerguelen -%%TZDATA%%share/postgresql/timezone/Indian/Mahe -%%TZDATA%%share/postgresql/timezone/Indian/Maldives -%%TZDATA%%share/postgresql/timezone/Indian/Mauritius -%%TZDATA%%share/postgresql/timezone/Indian/Mayotte -%%TZDATA%%share/postgresql/timezone/Indian/Reunion -%%TZDATA%%share/postgresql/timezone/Iran -%%TZDATA%%share/postgresql/timezone/Israel -%%TZDATA%%share/postgresql/timezone/Jamaica -%%TZDATA%%share/postgresql/timezone/Japan -%%TZDATA%%share/postgresql/timezone/Kwajalein -%%TZDATA%%share/postgresql/timezone/Libya -%%TZDATA%%share/postgresql/timezone/MET -%%TZDATA%%share/postgresql/timezone/MST -%%TZDATA%%share/postgresql/timezone/MST7MDT -%%TZDATA%%share/postgresql/timezone/Mexico/BajaNorte -%%TZDATA%%share/postgresql/timezone/Mexico/BajaSur -%%TZDATA%%share/postgresql/timezone/Mexico/General -%%TZDATA%%share/postgresql/timezone/NZ -%%TZDATA%%share/postgresql/timezone/NZ-CHAT -%%TZDATA%%share/postgresql/timezone/Navajo -%%TZDATA%%share/postgresql/timezone/PRC -%%TZDATA%%share/postgresql/timezone/PST8PDT -%%TZDATA%%share/postgresql/timezone/Pacific/Apia -%%TZDATA%%share/postgresql/timezone/Pacific/Auckland -%%TZDATA%%share/postgresql/timezone/Pacific/Chatham -%%TZDATA%%share/postgresql/timezone/Pacific/Chuuk -%%TZDATA%%share/postgresql/timezone/Pacific/Easter -%%TZDATA%%share/postgresql/timezone/Pacific/Efate -%%TZDATA%%share/postgresql/timezone/Pacific/Enderbury -%%TZDATA%%share/postgresql/timezone/Pacific/Fakaofo -%%TZDATA%%share/postgresql/timezone/Pacific/Fiji -%%TZDATA%%share/postgresql/timezone/Pacific/Funafuti -%%TZDATA%%share/postgresql/timezone/Pacific/Galapagos -%%TZDATA%%share/postgresql/timezone/Pacific/Gambier -%%TZDATA%%share/postgresql/timezone/Pacific/Guadalcanal -%%TZDATA%%share/postgresql/timezone/Pacific/Guam -%%TZDATA%%share/postgresql/timezone/Pacific/Honolulu -%%TZDATA%%share/postgresql/timezone/Pacific/Johnston -%%TZDATA%%share/postgresql/timezone/Pacific/Kiritimati -%%TZDATA%%share/postgresql/timezone/Pacific/Kosrae -%%TZDATA%%share/postgresql/timezone/Pacific/Kwajalein -%%TZDATA%%share/postgresql/timezone/Pacific/Majuro -%%TZDATA%%share/postgresql/timezone/Pacific/Marquesas -%%TZDATA%%share/postgresql/timezone/Pacific/Midway -%%TZDATA%%share/postgresql/timezone/Pacific/Nauru -%%TZDATA%%share/postgresql/timezone/Pacific/Niue -%%TZDATA%%share/postgresql/timezone/Pacific/Norfolk -%%TZDATA%%share/postgresql/timezone/Pacific/Noumea -%%TZDATA%%share/postgresql/timezone/Pacific/Pago_Pago -%%TZDATA%%share/postgresql/timezone/Pacific/Palau -%%TZDATA%%share/postgresql/timezone/Pacific/Pitcairn -%%TZDATA%%share/postgresql/timezone/Pacific/Pohnpei -%%TZDATA%%share/postgresql/timezone/Pacific/Ponape -%%TZDATA%%share/postgresql/timezone/Pacific/Port_Moresby -%%TZDATA%%share/postgresql/timezone/Pacific/Rarotonga -%%TZDATA%%share/postgresql/timezone/Pacific/Saipan -%%TZDATA%%share/postgresql/timezone/Pacific/Samoa -%%TZDATA%%share/postgresql/timezone/Pacific/Tahiti -%%TZDATA%%share/postgresql/timezone/Pacific/Tarawa -%%TZDATA%%share/postgresql/timezone/Pacific/Tongatapu -%%TZDATA%%share/postgresql/timezone/Pacific/Truk -%%TZDATA%%share/postgresql/timezone/Pacific/Wake -%%TZDATA%%share/postgresql/timezone/Pacific/Wallis -%%TZDATA%%share/postgresql/timezone/Pacific/Yap -%%TZDATA%%share/postgresql/timezone/Poland -%%TZDATA%%share/postgresql/timezone/Portugal -%%TZDATA%%share/postgresql/timezone/ROC -%%TZDATA%%share/postgresql/timezone/ROK -%%TZDATA%%share/postgresql/timezone/Singapore -%%TZDATA%%share/postgresql/timezone/Turkey -%%TZDATA%%share/postgresql/timezone/UCT -%%TZDATA%%share/postgresql/timezone/US/Alaska -%%TZDATA%%share/postgresql/timezone/US/Aleutian -%%TZDATA%%share/postgresql/timezone/US/Arizona -%%TZDATA%%share/postgresql/timezone/US/Central -%%TZDATA%%share/postgresql/timezone/US/East-Indiana -%%TZDATA%%share/postgresql/timezone/US/Eastern -%%TZDATA%%share/postgresql/timezone/US/Hawaii -%%TZDATA%%share/postgresql/timezone/US/Indiana-Starke -%%TZDATA%%share/postgresql/timezone/US/Michigan -%%TZDATA%%share/postgresql/timezone/US/Mountain -%%TZDATA%%share/postgresql/timezone/US/Pacific -%%TZDATA%%share/postgresql/timezone/US/Pacific-New -%%TZDATA%%share/postgresql/timezone/US/Samoa -%%TZDATA%%share/postgresql/timezone/UTC -%%TZDATA%%share/postgresql/timezone/Universal -%%TZDATA%%share/postgresql/timezone/W-SU -%%TZDATA%%share/postgresql/timezone/WET -%%TZDATA%%share/postgresql/timezone/Zulu -%%TZDATA%%share/postgresql/timezone/posixrules -share/postgresql/timezonesets/Africa.txt -share/postgresql/timezonesets/America.txt -share/postgresql/timezonesets/Antarctica.txt -share/postgresql/timezonesets/Asia.txt -share/postgresql/timezonesets/Atlantic.txt -share/postgresql/timezonesets/Australia -share/postgresql/timezonesets/Australia.txt -share/postgresql/timezonesets/Default *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 27 19:18:57 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9E147D7; Fri, 27 Feb 2015 19:18:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB4DEBBF; Fri, 27 Feb 2015 19:18:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1RJIv7i049465; Fri, 27 Feb 2015 19:18:57 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1RJIvbP049462; Fri, 27 Feb 2015 19:18:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502271918.t1RJIvbP049462@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 27 Feb 2015 19:18:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380117 - in branches/2015Q1/audio/gkrellmvolume2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Feb 2015 19:18:58 -0000 Author: amdmi3 Date: Fri Feb 27 19:18:56 2015 New Revision: 380117 URL: https://svnweb.freebsd.org/changeset/ports/380117 QAT: https://qat.redports.org/buildarchive/r380117/ Log: MFH: r378362 - Fix volume reading - Remove author from pkg-descr - Fix WWW: PR: 197247 Submitted by: amdmi3 Approved by: ports-secteam (zi), portmgr (mat) Modified: branches/2015Q1/audio/gkrellmvolume2/Makefile branches/2015Q1/audio/gkrellmvolume2/files/patch-oss_mixer.c branches/2015Q1/audio/gkrellmvolume2/pkg-descr Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/audio/gkrellmvolume2/Makefile ============================================================================== --- branches/2015Q1/audio/gkrellmvolume2/Makefile Fri Feb 27 19:03:07 2015 (r380116) +++ branches/2015Q1/audio/gkrellmvolume2/Makefile Fri Feb 27 19:18:56 2015 (r380117) @@ -3,7 +3,7 @@ PORTNAME= gkrellmvolume PORTVERSION= 2.1.13 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= audio MASTER_SITES= http://gkrellm.luon.net/files/ PKGNAMESUFFIX= 2 Modified: branches/2015Q1/audio/gkrellmvolume2/files/patch-oss_mixer.c ============================================================================== --- branches/2015Q1/audio/gkrellmvolume2/files/patch-oss_mixer.c Fri Feb 27 19:03:07 2015 (r380116) +++ branches/2015Q1/audio/gkrellmvolume2/files/patch-oss_mixer.c Fri Feb 27 19:18:56 2015 (r380117) @@ -1,7 +1,5 @@ -Index: oss_mixer.c -diff -u -p oss_mixer.c.orig oss_mixer.c ---- oss_mixer.c.orig Wed May 19 04:39:27 2004 -+++ oss_mixer.c Wed May 19 04:39:43 2004 +--- oss_mixer.c.orig 2004-08-20 00:07:27.000000000 +0400 ++++ oss_mixer.c 2015-02-01 20:21:32.000000000 +0300 @@ -32,6 +32,9 @@ #else #include @@ -12,3 +10,12 @@ diff -u -p oss_mixer.c.orig oss_mixer.c #include "mixer.h" #include "oss_mixer.h" +@@ -126,7 +129,7 @@ + long amount; + ioctl(OSSMIXER(mixer)->fd,MIXER_READ(OSSMIXER(mixer)->table[devid]),&amount); + *left = amount & 0xff; +- *right = amount >> 8; ++ *right = (amount >> 8) & 0xff; + } + + static void Modified: branches/2015Q1/audio/gkrellmvolume2/pkg-descr ============================================================================== --- branches/2015Q1/audio/gkrellmvolume2/pkg-descr Fri Feb 27 19:03:07 2015 (r380116) +++ branches/2015Q1/audio/gkrellmvolume2/pkg-descr Fri Feb 27 19:18:56 2015 (r380117) @@ -2,5 +2,4 @@ GKrellM volume plugin A plugin for gkrellm 2.0, that lets you control your mixer.. -Author: Sjoerd Simons -WWW: http://gkrellm.luon.net/volume.phtml +WWW: http://gkrellm.luon.net/volume.php From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 28 16:19:17 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 071CFAE7; Sat, 28 Feb 2015 16:19:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC4EF97A; Sat, 28 Feb 2015 16:19:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1SGJGY7049121; Sat, 28 Feb 2015 16:19:16 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1SGJGp1049120; Sat, 28 Feb 2015 16:19:16 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502281619.t1SGJGp1049120@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 28 Feb 2015 16:19:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380151 - branches/2015Q1/emulators/gngeo X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Feb 2015 16:19:17 -0000 Author: amdmi3 Date: Sat Feb 28 16:19:16 2015 New Revision: 380151 URL: https://svnweb.freebsd.org/changeset/ports/380151 QAT: https://qat.redports.org/buildarchive/r380151/ Log: MFH: r380131 - Simplify MASTER_SITES - Remove unneeded MAN1 - Don't show pkg-message from Makefile - Disable and mark broken RAZE and STAR options, as they fail to link - Fix configure to properly detect amd64 arch - When compiling with clang, drop compiler flags not supported by it - Disable -malign-double on amd64, gcc says it makes no sense Approved by: bapt Approved by: ports-secteam (zi) Modified: branches/2015Q1/emulators/gngeo/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/emulators/gngeo/Makefile ============================================================================== --- branches/2015Q1/emulators/gngeo/Makefile Sat Feb 28 16:18:02 2015 (r380150) +++ branches/2015Q1/emulators/gngeo/Makefile Sat Feb 28 16:19:16 2015 (r380151) @@ -5,13 +5,12 @@ PORTNAME= gngeo PORTVERSION= 0.8 PORTREVISION= 2 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= GOOGLE_CODE/${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= NeoGeo emulator -USES= gmake +USES= compiler:features gmake USE_SDL= image sdl USE_GL= yes @@ -27,11 +26,10 @@ MAKE_ARGS+= CC_FOR_BUILD=${CC} SUB_FILES= pkg-message OPTIONS_DEFINE_i386= ASM RAZE STAR -OPTIONS_DEFAULT_i386= ASM RAZE STAR -RAZE_DESC= Use Raze as z80 emulator -STAR_DESC= Use Starscream as 68k emulator +OPTIONS_DEFAULT_i386= ASM +RAZE_DESC= Use Raze as z80 emulator (broken) +STAR_DESC= Use Starscream as 68k emulator (broken) -MAN1= gngeo.1 .include .if ${PORT_OPTIONS:MI386ASM} || ${PORT_OPTIONS:MRAZE} || \ @@ -47,17 +45,29 @@ CONFIGURE_ARGS+= --disable-i386asm .if ${PORT_OPTIONS:MRAZE} CONFIGURE_ARGS+= --with-z80core=raze +BROKEN= fails to link .else CONFIGURE_ARGS+= --with-z80core=mamez80 .endif .if ${PORT_OPTIONS:MSTAR} CONFIGURE_ARGS+= --with-m68kcore=starscream +BROKEN= fails to link .else CONFIGURE_ARGS+= --with-m68kcore=gen68k .endif post-patch: + @${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure +.if ${ARCH} == "amd64" + @${REINPLACE_CMD} -e 's|-malign-double||' ${WRKSRC}/configure +.endif +.if ${COMPILER_TYPE} == "clang" + @${REINPLACE_CMD} -e 's|-frerun-loop-opt||; \ + s|-falign-jumps=2||; s|-falign-loops=2||; \ + s|-fschedule-insns2||; s|-malign-double||' \ + ${WRKSRC}/configure +.endif @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ ${WRKSRC}/src/generator68k/Makefile.in @@ -65,6 +75,5 @@ post-patch: post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample_gngeorc ${STAGEDIR}${EXAMPLESDIR}/gngeorc - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} .include