Index: branches/fc11-dev/locker/bin/fix-php-ini =================================================================== --- branches/fc11-dev/locker/bin/fix-php-ini (revision 1232) +++ branches/fc11-dev/locker/bin/fix-php-ini (revision 1238) @@ -8,5 +8,5 @@ if [ -f php.ini ]; then echo "Creating php.ini symlinks in child directories..." - athrun scripts gfind . -mindepth 1 -type d -exec sh -c 'ln -sf "`echo "$1" | sed '\''s,[^/],,g; s,/,../,g'\''`php.ini" "$1/"' -- {} \; + athrun scripts gfind . -mindepth 1 -type d \( -not -name .svn -not -name .git -or -not -prune \) -exec sh -c 'ln -sf "`echo "$1" | sed '\''s,[^/],,g; s,/,../,g'\''`php.ini" "$1/"' -- {} \; echo "Done!" else Index: branches/fc11-dev/server/common/oursrc/php_scripts/Makefile.in =================================================================== --- branches/fc11-dev/server/common/oursrc/php_scripts/Makefile.in (revision 1238) +++ branches/fc11-dev/server/common/oursrc/php_scripts/Makefile.in (revision 1238) @@ -0,0 +1,22 @@ +CC = @CC@ +CFLAGS = @CFLAGS@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +MODS = scripts + +all-local: $(patsubst %,.libs/%.so,$(MODS)) + +.libs/%.so: %.c + $(CC) $(CFLAGS) -c $< + +install: + install -p -m755 -D .libs/scripts.so $(DESTDIR)/usr/lib64/php/modules/scripts.so + +clean: + rm -f $(MODS:=.so) $(MODS:=.o) $(MODS:=.la) $(MODS:=.lo) $(MODS:=.slo) $(MODS:=.lai) + rm -rf .libs modules + +distclean: clean + rm -f configure config.* Makefile + rm -rf auto*.cache Index: branches/fc11-dev/server/common/oursrc/php_scripts/build.sh =================================================================== --- branches/fc11-dev/server/common/oursrc/php_scripts/build.sh (revision 1232) +++ (revision ) @@ -1,18 +1,0 @@ -#!/bin/bash - -mkdir -p test/ -cp -a config.m4 php_scripts.c php_scripts.h test/ -cd test/ -phpize -./configure -make -exit - -cd ../ -echo '*****' -php -c php.ini test.php -echo '*****' -php-cgi test.php -echo '*****' -php-cgi -c php.ini test.php -echo '*****' Index: branches/fc11-dev/server/common/oursrc/php_scripts/config.m4 =================================================================== --- branches/fc11-dev/server/common/oursrc/php_scripts/config.m4 (revision 1232) +++ (revision ) @@ -1,7 +1,0 @@ -PHP_ARG_ENABLE(scripts, whether to enable scripts.mit.edu support, -[ --enable-scripts Enable scripts.mit.edu support]) - -if test "$PHP_SCRIPTS" != "no"; then - AC_DEFINE(HAVE_SCRIPTS, 1, [Whether you have scripts.mit.edu support]) - PHP_NEW_EXTENSION(scripts, php_scripts.c, $ext_shared) -fi Index: branches/fc11-dev/server/common/oursrc/php_scripts/mrproper =================================================================== --- branches/fc11-dev/server/common/oursrc/php_scripts/mrproper (revision 1238) +++ branches/fc11-dev/server/common/oursrc/php_scripts/mrproper (revision 1238) @@ -0,0 +1,6 @@ +#!/bin/sh + +rm -f scripts.so +rm -f configure config.* Makefile +rm -rf auto*.cache +rm -rf .libs Index: branches/fc11-dev/server/common/oursrc/php_scripts/php.ini =================================================================== --- branches/fc11-dev/server/common/oursrc/php_scripts/php.ini (revision 1232) +++ (revision ) @@ -1,5 +1,0 @@ -;display_startup_errors = On -extension_dir = /root/php_scripts/test/modules/ -extension = ../../../../root/php_scripts/test/modules/scripts.so -;zend_extension_ts = ../../../../root/php_scripts/test/modules/scripts.so -error_reporting = E_ALL Index: branches/fc11-dev/server/common/oursrc/php_scripts/php_scripts-config.m4 =================================================================== --- branches/fc11-dev/server/common/oursrc/php_scripts/php_scripts-config.m4 (revision 1238) +++ branches/fc11-dev/server/common/oursrc/php_scripts/php_scripts-config.m4 (revision 1238) @@ -0,0 +1,7 @@ +PHP_ARG_ENABLE(scripts, whether to enable scripts.mit.edu support, +[ --enable-scripts Enable scripts.mit.edu support]) + +if test "$PHP_SCRIPTS" != "no"; then + AC_DEFINE(HAVE_SCRIPTS, 1, [Whether you have scripts.mit.edu support]) + PHP_NEW_EXTENSION(scripts, php_scripts.c, $ext_shared) +fi Index: branches/fc11-dev/server/common/oursrc/php_scripts/test.php =================================================================== --- branches/fc11-dev/server/common/oursrc/php_scripts/test.php (revision 1232) +++ (revision ) @@ -1,7 +1,0 @@ - /usr/lib/python2.6/site-packages/00scripts-home.pth -# Build and install the scripts php module that enhances error logging info -# XXX This thing really ought to be packaged - cp -r /srv/repository/server/common/oursrc/php_scripts /root - cd /root/php_scripts - ./build.sh - cp test/modules/scripts.so /usr/lib64/php/modules - # Install the credentials. There are a lot of things to remember here: # o This will be different if you're setting up our build/update server. Index: branches/fc11-dev/server/fedora/Makefile =================================================================== --- branches/fc11-dev/server/fedora/Makefile (revision 1232) +++ branches/fc11-dev/server/fedora/Makefile (revision 1238) @@ -21,5 +21,5 @@ 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,5 +180,5 @@ # 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 Index: branches/fc11-dev/server/fedora/config/etc/postfix/blocked_users =================================================================== --- branches/fc11-dev/server/fedora/config/etc/postfix/blocked_users (revision 1238) +++ branches/fc11-dev/server/fedora/config/etc/postfix/blocked_users (revision 1238) @@ -0,0 +1,2 @@ +reuter +cycling-club Index: branches/fc11-dev/server/fedora/config/etc/postfix/main.cf =================================================================== --- branches/fc11-dev/server/fedora/config/etc/postfix/main.cf (revision 1232) +++ branches/fc11-dev/server/fedora/config/etc/postfix/main.cf (revision 1238) @@ -31,3 +31,3 @@ 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 Index: branches/fc11-dev/server/fedora/config/usr/vice/etc/CellServDB.local =================================================================== --- branches/fc11-dev/server/fedora/config/usr/vice/etc/CellServDB.local (revision 1232) +++ branches/fc11-dev/server/fedora/config/usr/vice/etc/CellServDB.local (revision 1238) @@ -17,5 +17,5 @@ 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,8 +255,4 @@ 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 Index: branches/fc11-dev/server/fedora/specs/php_scripts.spec =================================================================== --- branches/fc11-dev/server/fedora/specs/php_scripts.spec (revision 1238) +++ branches/fc11-dev/server/fedora/specs/php_scripts.spec (revision 1238) @@ -0,0 +1,41 @@ +Summary: scripts.mit.edu php logging module +Group: Applications/System +Name: php_scripts +Version: 0.%{scriptsversion} +Release: 0 +Vendor: The scripts.mit.edu Team (scripts@mit.edu) +URL: http://scripts.mit.edu +License: GPL +Source: %{name}.tar.gz +BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root +BuildRequires: php-devel +%define debug_package %{nil} + +%description + +scripts.mit.edu php logging module + +%prep +%setup -q -n %{name} + +%build +cp php_scripts-config.m4 config.m4 +phpize +./configure +make + +%install +[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT +install -D .libs/scripts.so $RPM_BUILD_ROOT/usr/lib64/php/modules/scripts.so + +%clean +[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT + +%files +%defattr(0755, root, root) +/usr/lib64/php/modules/scripts.so + +%changelog + +* Fri Jul 03 2009 Mitchell Berger 0.00 +- initial version Index: branches/fc11-dev/server/fedora/specs/scripts-base.spec =================================================================== --- branches/fc11-dev/server/fedora/specs/scripts-base.spec (revision 1232) +++ branches/fc11-dev/server/fedora/specs/scripts-base.spec (revision 1238) @@ -9,5 +9,5 @@ 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}