Changeset 1238 for branches/fc11-dev/server/fedora

Timestamp:

Jul 3, 2009, 3:47:04 AM (15 years ago)

Author:

mitchb

Message:

Merge r1225:1237 from trunk to branches/fc11-dev

Location:

branches/fc11-dev

Files:

• . (modified) (1 prop)
• server/fedora/Makefile (modified) (2 diffs)
• server/fedora/config/etc/postfix/blocked_users (copied) (copied from trunk/server/fedora/config/etc/postfix/blocked_users)
• server/fedora/config/etc/postfix/main.cf (modified) (1 diff)
• server/fedora/config/usr/vice/etc/CellServDB.local (modified) (2 diffs)
• server/fedora/specs/php_scripts.spec (copied) (copied from trunk/server/fedora/specs/php_scripts.spec)
• server/fedora/specs/scripts-base.spec (modified) (1 diff)

branches/fc11-dev/server/fedora/Makefile

@@ -21 +21 @@
 upstream_yum    = krb5 httpd openssh php
 upstream        = openafs $(upstream_yum)
-oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 athrun scripts-base
+oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 athrun php_scripts scripts-base
 allsrc          = $(upstream) $(oursrc)
 oursrcdir       = ${PWD}/../common/oursrc
@@ -180 +180 @@
 # The following packages are needed for our packages
 basic-deps      = kernel-devel rpm-build rpmdevtools gcc autoconf patch krb5-workstation glibc-devel.i586 glibc-devel libtool libgcc.i586
-oursrc-deps     = hesinfo openldap-clients openldap-devel.i586
+oursrc-deps     = hesinfo openldap-clients openldap-devel.i586 php-devel
 httpdmods-deps  = httpd-devel
 httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel

branches/fc11-dev/server/fedora/config/etc/postfix/main.cf

@@ -31 +31 @@
 virtual_alias_maps = hash:/etc/postfix/virtual, regexp:/etc/postfix/virtual_re
 data_directory = /var/lib/postfix
-authorized_submit_users = !reuter, static:all
+authorized_submit_users = !/etc/postfix/blocked_users, static:all

branches/fc11-dev/server/fedora/config/usr/vice/etc/CellServDB.local

@@ -17 +17 @@
 18.90.0.123                     #sangeet.mit.edu.
 >grand.central.org      #GCO Public CellServDB 07 Nov 2008
-18.92.0.108                     #grand-opening.mit.edu
+18.9.48.14                      #grand.mit.edu.
 128.2.203.61                    #penn.central.org
 130.237.48.87                   #andrew.e.kth.se
@@ -255 +255 @@
 129.186.6.243                   #afsdb-2.iastate.edu
 129.186.142.243                 #afsdb-3.iastate.edu
->soap.mit.edu           #MIT School Of Architecture & Planning
-18.89.1.204                     #crypt.mit.edu
-18.89.1.209                     #grotto.mit.edu
-18.89.2.156                     #ac.mit.edu
 >msu.edu                #Michigan State University Main Cell
 35.9.7.10                       #afsdb0.cl.msu.edu

branches/fc11-dev/server/fedora/specs/scripts-base.spec

@@ -9 +9 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
-Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-php
+Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-php, php_scripts
 %define debug_package %{nil}