Changeset 1259 for trunk/server/fedora


Ignore:
Timestamp:
Jul 9, 2009, 3:48:21 PM (15 years ago)
Author:
mitchb
Message:
Reintegrate branches/fc11-dev (r1121:1258) to trunk
Location:
trunk
Files:
3 deleted
21 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/server/fedora/Makefile

    r1235 r1259  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 httpd openssh pysvn php
     21upstream_yum    = krb5 httpd openssh php
    2222upstream        = openafs $(upstream_yum)
    23 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i386 whoisd mit-zephyr nss-ldapd nss-ldapd.i386 athrun php_scripts scripts-base
     23oursrc          = 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
    2424allsrc          = $(upstream) $(oursrc)
    2525oursrcdir       = ${PWD}/../common/oursrc
    … …  
    127127$(oursrc): rpmbuild_args += --define 'scriptsversion $(shell svnversion ${oursrcdir}/$** | tr ':' '_')'
    128128
    129 $(filter %.i386,$(oursrc)): %.i386: setup
     129$(filter %.i586,$(oursrc)): %.i586: setup
    130130        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    131         setarch i386 rpmbuild $(rpmbuild_args) --target=i386 --define="_lib lib" -bb ${tmp_specs}/$**.spec
     131        setarch i586 rpmbuild $(rpmbuild_args) --target=i586 --define="_lib lib" -bb ${tmp_specs}/$**.spec
    132132
    133 $(filter-out %.i386,$(oursrc)): %: setup
     133$(filter-out %.i586,$(oursrc)): %: setup
    134134        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    135135        rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/$**.spec
    … …  
    179179
    180180# The following packages are needed for our packages
    181 basic-deps      = kernel-devel rpm-build rpmdevtools gcc autoconf patch krb5-workstation glibc-devel.i386 glibc-devel libtool libgcc.i386
    182 oursrc-deps     = hesinfo openldap-clients php-devel
     181basic-deps      = kernel-devel rpm-build rpmdevtools gcc autoconf patch krb5-workstation glibc-devel.i586 glibc-devel libtool libgcc.i586
     182oursrc-deps     = hesinfo openldap-clients openldap-devel.i586 php-devel
    183183httpdmods-deps  = httpd-devel
    184184httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
    185 krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex
     185krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex texlive-latex
    186186openafs-deps    = pam-devel automake
    187 mit-zephyr-deps = readline-devel hesiod-devel hesiod-devel.i386 hesiod.i386 libXt.i386 #compat-readline43
    188 openssh-deps    = gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth gobject-devel pango-devel cairo-devel libedit-devel nss-devel
     187mit-zephyr-deps = readline-devel hesiod-devel hesiod-devel.i586 hesiod.i586 libXt.i586 #compat-readline43
     188openssh-deps    = gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth pango-devel cairo-devel libedit-devel nss-devel fipscheck-devel
     189php-deps        = bzip2-devel curl-devel gmp-devel libstdc++-devel sqlite-devel gcc-c++ libc-client-devel mysql-devel postgresql-devel unixODBC-devel libxml2-devel net-snmp-devel libxslt-devel libxml2-devel libXpm-devel libjpeg-devel t1lib-devel libmcrypt-devel mhash-devel libtidy-devel freetds-devel aspell-devel recode-devel
    189190install-deps:
    190         yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps)
     191        yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps) $(php-deps)
    191192        rpm -ivh ftp://ftp.muug.mb.ca/mirror/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
    192193#       rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm

  • trunk/server/fedora/config/etc/httpd/conf/httpd.conf

    r1164 r1259  
    260260
    261261RLimitCPU 300 300
    262 RLimitMEM 536870912 536870912
     262RLimitMEM 1342177280 1342177280
    263263RLimitNPROC 4096 4096
    264264

  • trunk/server/fedora/config/etc/logrotate.d/httpd

    r180 r1259  
    66    sharedscripts
    77    postrotate
    8         /bin/kill -HUP `cat /var/run/httpd.pid 2>/dev/null` 2> /dev/null || true
     8        /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
    99    endscript
    1010}

  • trunk/server/fedora/config/etc/munin/munin-node.conf

    r847 r1259  
    55log_level 4
    66log_file /var/log/munin/munin-node.log
    7 port 4949
    87pid_file /var/run/munin/munin-node.pid
     8
    99background 1
    1010setseid 1
    1111
    12 # Which port to bind to;
    13 host *
    1412user munin
    1513group munin
    … …  
    2321ignore_file \.dpkg-(tmp|new|old|dist)$
    2422ignore_file \.rpm(save|new)$
     23ignore_file \.pod$
    2524
    2625# Set this if the client doesn't report the correct hostname when
    2726# telnetting to localhost, port 4949
    2827#
    29 #host_name ppc2.fedora.redhat.com
     28#host_name x86-3.fedora.phx.redhat.com
    3029
    3130# A list of addresses that are allowed to connect.  This must be a
    … …  
    3736allow ^18\.187\.1\.128$
    3837allow ^18\.181\.0\.65$
     38
     39# Which address to bind to;
     40host *
     41# host 127.0.0.1
     42
     43# And which port
     44port 4949
     45

  • trunk/server/fedora/config/etc/munin/plugin-conf.d/munin-node

    r865 r1259  
     1# This file is used to configure how the plugins are invoked.
     2# Place in /etc/munin/plugin-conf.d/ or corresponding directory.
    13#
    2 # This file contains configuration options for the plugins. Three
    3 # options are understood by munin-node itself:
     4# PLEASE NOTE: Changes in the plugin-conf.d directory are only
     5# read at munin-node startup, so restart at any changes.
    46#
    5 #       user <user>         # Set the user to run the plugin as
    6 #       group <group>       # Set the group to run the plugin as
    7 #       command <command>   # Run <command> instead of the plugin. %c
    8 #                             expands to what would normally be run.
    9 #   env.<variable>      # Sets <variable> in the plugin's environment, see the
    10 #                         individual plugins to find out which variables they
    11 #                         care about.
     7#  user <user>         # Set the user to run the plugin as
     8#  group <group>       # Set the group to run the plugin as
     9#  command <command>   # Run <command> instead of the plugin. %c
     10#                        expands to what would normally be run.
     11#  env.<variable> <value> # Sets <variable> in the plugin's environment, see the
     12#                        individual plugins to find out which variables they
     13#                        care about.
    1214#
    1315#

  • trunk/server/fedora/config/etc/nagios/nrpe.cfg

    r982 r1259  
    33# Written by: Ethan Galstad (nagios@nagios.org)
    44#
    5 # Last Modified: 02-23-2006
     5# Last Modified: 11-23-2007
    66#
    77# NOTES:
    … …  
    1212
    1313
     14# LOG FACILITY
     15# The syslog facility that should be used for logging purposes.
     16
     17log_facility=daemon
     18
     19
     20
    1421# PID FILE
    1522# The name of the file in which the NRPE daemon should write it's process ID
    … …  
    3542# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
    3643
    37 #server_address=192.168.1.1
     44#server_address=127.0.0.1
    3845
    3946
    … …  
    4552# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
    4653
    47 nrpe_user=nagios
     54nrpe_user=nrpe
    4855
    4956
    … …  
    5562# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
    5663
    57 nrpe_group=nagios
     64nrpe_group=nrpe
    5865
    5966
    … …  
    125132
    126133command_timeout=60
     134
     135
     136
     137# CONNECTION TIMEOUT
     138# This specifies the maximum number of seconds that the NRPE daemon will
     139# wait for a connection to be established before exiting. This is sometimes
     140# seen where a network problem stops the SSL being established even though
     141# all network sessions are connected. This causes the nrpe daemons to
     142# accumulate, eating system resources. Do not set this too low.
     143
     144connection_timeout=300
    127145
    128146
    … …  
    176194# examples only!
    177195
     196
    178197# The following examples use hardcoded command arguments...
    179198
    180199#command[check_users]=/usr/lib64/nagios/plugins/check_users -w 5 -c 10
    181200#command[check_load]=/usr/lib64/nagios/plugins/check_load -w 15,10,5 -c 30,25,20
    182 #command[check_disk1]=/usr/lib64/nagios/plugins/check_disk -w 20 -c 10 -p /dev/hda1
    183 #command[check_disk2]=/usr/lib64/nagios/plugins/check_disk -w 20 -c 10 -p /dev/hdb1
     201#command[check_hda1]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1
    184202#command[check_zombie_procs]=/usr/lib64/nagios/plugins/check_procs -w 5 -c 10 -s Z
    185203#command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200
     204
    186205
    187206# The following examples allow user-supplied arguments and can
    188207# only be used if the NRPE daemon was compiled with support for
    189208# command arguments *AND* the dont_blame_nrpe directive in this
    190 # config file is set to '1'...
     209# config file is set to '1'.  This poses a potential security risk, so
     210# make sure you read the SECURITY file before doing this.
    191211
    192212command[check_users]=/usr/lib64/nagios/plugins/check_users -w $ARG1$ -c $ARG2$

  • trunk/server/fedora/config/etc/nscd.conf

    r879 r1259  
    3535        max-threads             128
    3636        server-user             nscd
    37 #       stat-user               nocpulse
     37#       stat-user               somebody
    3838        debug-level             0
    3939#31

  • trunk/server/fedora/config/etc/printcap

    r39 r1259  
     1# This file was automatically generated by cupsd(8) from the
     2# /etc/cups/printers.conf file.  All changes to this file
     3# will be lost.

  • trunk/server/fedora/config/etc/security/limits.conf

    r1165 r1259  
    2727#        - cpu - max CPU time (MIN)
    2828#        - nproc - max number of processes
    29 #        - as - address space limit
     29#        - as - address space limit (KB)
    3030#        - maxlogins - max number of logins for this user
    3131#        - maxsyslogins - max number of logins on the system
    … …  
    3434#        - sigpending - max number of pending signals
    3535#        - msgqueue - max memory used by POSIX message queues (bytes)
    36 #        - nice - max nice priority allowed to raise to
     36#        - nice - max nice priority allowed to raise to values: [-20, 19]
    3737#        - rtprio - max realtime priority
    3838#
    … …  
    4141
    4242# No limits for root
    43 root            -
     43root             -
     44scripts-build    -
    4445
    4546# For everyone else,
    46 *               soft    core            0
    47 *               -       rss             524268
    48 *               -       data            1048576
    49 *               -       as              1048576
     47*                soft    core            0
     48*                -       rss             524268
     49*                -       data            1048576
     50*                -       as              1310720
     51
     52#*               soft    core            0
    5053#*               hard    rss             10000
    5154#@student        hard    nproc           20

  • trunk/server/fedora/config/etc/sudoers

    r914 r1259  
    3434
    3535## Updating the locate database
    36 Cmnd_Alias LOCATE = /usr/sbin/updatedb
     36Cmnd_Alias LOCATE = /usr/bin/updatedb
    3737
    3838## Storage

  • trunk/server/fedora/config/etc/sysconfig/openafs

    r1020 r1259  
    1010          Sulphur)
    1111            /usr/bin/fs sysname 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
     12          Leonidas)
     13            /usr/bin/fs sysname 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
    1214          *)
    1315            echo "Warning: unknown platform. AFS sysname not set."

  • trunk/server/fedora/config/etc/syslog-ng/syslog-ng.conf

    r817 r1259  
    66# See syslog-ng(8) and syslog-ng.conf(5) for more information.
    77#
    8 # 20000925 gb@sysfive.com
    9 #
    10 # Updated by Frank Crawford (<Frank.Crawford@ac3.com.au>) - 10 Aug 2002
    11 #   - for Red Hat 7.3
    12 #   - totally do away with klogd
    13 #   - add message "kernel:" as is done with klogd.
    14 #
    15 # Updated by Frank Crawford (<Frank.Crawford@ac3.com.au>) - 22 Aug 2002
    16 #   - use the log_prefix option as per Balazs Scheidler's email
    17 #
    18 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 05 Apr 2003
    19 #   - corrected filters 'f_filter2' and 'f_filter6'
    20 #     these filters were only allowing messages of one specific
    21 #     priority level; they should be allowing messages from that
    22 #     priority and upper levels.
    23 #
    24 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 25 Jan 2005
    25 #   - Don't sync the d_mail destination
    26 #
    27 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 01 Feb 2005
    28 #   - /proc/kmsg is a file not a pipe.
    29 #     (https://lists.balabit.hu/pipermail/syslog-ng/2005-February/006963.html)
    30 #
    31 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 31 May 2007
    32 #   - increase the number of unix-stream max-connections (syslog-ng 2.0.4)
    33 #
    34 # Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 26 July 2007
    35 #   - revert previous unix-stream max-connections change
    36 #     (the new unix-stream max-connections default in syslog-ng 2.0.5 is 256)
    37 #
    388
    399options {
    40     sync (0);
    41     time_reopen (10);
    42     log_fifo_size (1000);
    43     long_hostnames (off);
    44     use_dns (no);
    45     use_fqdn (no);
    46     create_dirs (no);
    47     keep_hostname (yes);
     10        sync (0);
     11        time_reopen (10);
     12        log_fifo_size (1000);
     13        long_hostnames (off);
     14        use_dns (no);
     15        use_fqdn (no);
     16        create_dirs (no);
     17        keep_hostname (yes);
    4818};
    4919
    5020source s_sys {
    51     file ("/proc/kmsg" log_prefix("kernel: "));
    52     unix-stream ("/dev/log");
    53     internal();
    54     # udp(ip(0.0.0.0) port(514));
    55     # tcp(ip(0.0.0.0) port(514));
     21        file ("/proc/kmsg" log_prefix("kernel: "));
     22        unix-stream ("/dev/log");
     23        internal();
     24        # udp(ip(0.0.0.0) port(514));
    5625};
    5726
    … …  
    6332destination d_boot { file("/var/log/boot.log"); };
    6433destination d_cron { file("/var/log/cron"); };
     34#destination d_kern { file("/var/log/kern"); };
    6535destination d_mlal { usertty("*"); };
    6636
    … …  
    6838#destination d_watch { program("/usr/local/libexec/watch-syslog.py"); };
    6939
    70 #filter f_filter1   { facility(kern); };
    71 filter f_filter2   { level(info..emerg) and
    72                      not facility(mail,authpriv,cron); };
    73 filter f_filter3   { facility(authpriv); };
    74 filter f_filter4   { facility(mail); };
    75 filter f_filter5   { level(emerg); };
    76 filter f_filter6   { facility(uucp) or
    77                      (facility(news) and level(crit..emerg)); };
    78 filter f_filter7   { facility(local7); };
    79 filter f_filter8   { facility(cron); };
     40#filter f_kernel     { facility(kern); };
     41filter f_default    { level(info..emerg) and
     42                        not (facility(mail)
     43                        or facility(authpriv)
     44                        or facility(cron)); };
     45filter f_auth       { facility(authpriv); };
     46filter f_mail       { facility(mail); };
     47filter f_emergency  { level(emerg); };
     48filter f_news       { facility(uucp) or
     49                        (facility(news)
     50                        and level(crit..emerg)); };
     51filter f_boot   { facility(local7); };
     52filter f_cron   { facility(cron); };
    8053
    8154filter f_oom { facility(kern) and (match("Out of memory:") or match("Killed process")); };
    8255
    83 #log { source(s_sys); filter(f_filter1); destination(d_cons); };
    84 log { source(s_sys); filter(f_filter2); destination(d_mesg); };
    85 log { source(s_sys); filter(f_filter3); destination(d_auth); };
    86 log { source(s_sys); filter(f_filter4); destination(d_mail); };
    87 log { source(s_sys); filter(f_filter5); destination(d_mlal); };
    88 log { source(s_sys); filter(f_filter6); destination(d_spol); };
    89 log { source(s_sys); filter(f_filter7); destination(d_boot); };
    90 log { source(s_sys); filter(f_filter8); destination(d_cron); };
     56#log { source(s_sys); filter(f_kernel); destination(d_cons); };
     57#log { source(s_sys); filter(f_kernel); destination(d_kern); };
     58log { source(s_sys); filter(f_default); destination(d_mesg); };
     59log { source(s_sys); filter(f_auth); destination(d_auth); };
     60log { source(s_sys); filter(f_mail); destination(d_mail); };
     61log { source(s_sys); filter(f_emergency); destination(d_mlal); };
     62log { source(s_sys); filter(f_news); destination(d_spol); };
     63log { source(s_sys); filter(f_boot); destination(d_boot); };
     64log { source(s_sys); filter(f_cron); destination(d_cron); };
    9165
    92 log { source(s_sys); filter(f_filter3); destination(d_zroot); };
    93 #log { source(s_sys); filter(f_filter2); destination(d_watch); };
     66log { source(s_sys); filter(f_auth); destination(d_zroot); };
     67#log { source(s_sys); filter(f_default); destination(d_watch); };
    9468log { source(s_sys); filter(f_oom); destination(d_zroot); };
    9569
    96 # vim:set ai ts=4 sw=4 sts=4 et:
     70# vim:ft=syslog-ng:ai:si:ts=4:sw=4:et:

  • trunk/server/fedora/config/etc/yum.repos.d/scripts.repo

    r866 r1259  
    11[scripts]
    22name=Scripts
    3 baseurl=http://web.mit.edu/scripts/rpm/
     3baseurl=http://web.mit.edu/scripts/rpm-fc11/
    44enabled=1
    55gpgcheck=0

  • trunk/server/fedora/specs/httpd.spec.patch

    r1035 r1259  
    1 --- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
    2 +++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
    3 @@ -6,7 +6,7 @@
     1--- httpd.spec.orig     2009-03-17 09:12:22.000000000 -0400
     2+++ httpd.spec  2009-06-03 05:05:30.000000000 -0400
     3@@ -7,7 +7,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.10
    7 -Release: 1%{?dist}
    8 +Release: 1%{?dist}.scripts.%{scriptsversion}
     6 Version: 2.2.11
     7-Release: 8
     8+Release: 8.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1111 Source1: index.html
    12 @@ -54,6 +54,12 @@
     12@@ -56,6 +56,12 @@
    1313 Conflicts: pcre < 4.0
    14  Requires: httpd-tools = %{version}-%{release}
     14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
    1515 
    1616+Provides: scripts-httpd
    … …  
    2323 The Apache HTTP Server is a powerful, efficient, and extensible
    2424 web server.
    25 @@ -100,6 +106,7 @@
     25@@ -102,6 +108,7 @@
    2626 BuildRequires: openssl-devel, distcache-devel
    2727 Requires(post): openssl >= 0.9.7f-4, /bin/cat
    … …  
    3131 
    3232 %description -n mod_ssl
    33 @@ -127,6 +134,11 @@
     33@@ -130,6 +137,11 @@
    3434 # Patch in vendor/release string
    3535 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    … …  
    4343 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    4444 if test "x${vmmn}" != "x%{mmn}"; then
    45 @@ -175,10 +187,12 @@
     45@@ -178,10 +190,12 @@
    4646         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    4747        --enable-suexec --with-suexec \

  • trunk/server/fedora/specs/krb5.spec.patch

    r1069 r1259  
    1 --- krb5.spec.old       2009-04-08 06:26:23.000000000 -0400
    2 +++ krb5.spec   2009-04-08 06:29:20.000000000 -0400
     1--- krb5.spec.orig      2009-04-07 15:17:07.000000000 -0400
     2+++ krb5.spec   2009-06-03 04:47:31.000000000 -0400
    33@@ -16,7 +16,7 @@
    44 Summary: The Kerberos network authentication system.
    55 Name: krb5
    66 Version: 1.6.3
    7 -Release: 16%{?dist}
    8 +Release: 16%{?dist}.scripts.%{scriptsversion}
     7-Release: 20%{?dist}
     8+Release: 20%{?dist}.scripts.%{scriptsversion}
    99 # Maybe we should explode from the now-available-to-everybody tarball instead?
    1010 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
    1111 Source0: krb5-%{version}.tar.gz
    12 @@ -105,6 +105,8 @@
    13  Patch82: krb5-CVE-2009-0846.patch
    14  Patch83: krb5-CVE-2009-0847.patch
     12@@ -106,6 +106,8 @@
     13 Patch83: krb5-CVE-2009-0846.patch
     14 Patch84: krb5-CVE-2009-0847.patch
    1515 
    1616+Patch1000: krb5-kuserok-scripts.patch
    1717+
    18  License: MIT, freely distributable.
     18 License: MIT
    1919 URL: http://web.mit.edu/kerberos/www/
    2020 Group: System Environment/Libraries
    21 @@ -146,6 +148,7 @@
     21@@ -147,6 +149,7 @@
    2222 Group: System Environment/Libraries
    2323 Prereq: grep, /sbin/ldconfig, sh-utils
    … …  
    2727 %description libs
    2828 Kerberos is a network authentication system. The krb5-libs package
    29 @@ -1389,6 +1392,7 @@
    30  %patch81 -p1 -b .CVE-2009-0844-0845-2
    31  %patch82 -p1 -b .CVE-2009-0846
    32  %patch83 -p1 -b .CVE-2009-0847
     29@@ -1413,6 +1416,7 @@
     30 %patch82 -p1 -b .CVE-2009-0844-0845-2
     31 %patch83 -p1 -b .CVE-2009-0846
     32 %patch84 -p1 -b .CVE-2009-0847
    3333+%patch1000 -p1 -b .kuserok
    3434 cp src/krb524/README README.krb524

  • trunk/server/fedora/specs/nss-ldapd.spec.patch

    r1132 r1259  
    11--- nss-ldapd.spec.orig 2009-03-30 04:33:50.000000000 -0400
    2 +++ nss-ldapd.spec      2009-05-24 18:39:15.000000000 -0400
     2+++ nss-ldapd.spec      2009-06-03 03:18:49.000000000 -0400
    33@@ -19,18 +19,19 @@
    44 
    … …  
    5555 %files
    5656 %defattr(-,root,root)
    57 @@ -104,11 +99,12 @@
     57@@ -104,7 +99,6 @@
    5858 %doc %{_mandir}/man8/*
    5959 %config(noreplace) %attr(640,root,root) /etc/nss-ldapd.conf
    … …  
    6363 /usr/sbin/nslcd
    6464 
    65  %changelog
    66 +* Sun May 24 2009 Anders Kaseorg <andersk@mit.edu> - 0.6.8-2.1
    67 +- Update for Fedora again.
    68  * Wed Mar 25 2009 rhafer@suse.de
    69  - Updated to 0.6.8:
    70    * the nss-ldapd.conf was created world-readable which could cause
    71 @@ -129,6 +125,10 @@
     65@@ -129,6 +123,10 @@
    7266 - Adjust config file permissions upon update, to fix world-readable
    7367   /etc/nss-ldapd.conf as created by older versions

  • trunk/server/fedora/specs/openafs.spec.patch

    r1079 r1259  
    1 --- openafs.spec.orig   2009-04-08 08:17:00.000000000 -0400
    2 +++ openafs.spec        2009-04-14 04:32:44.000000000 -0400
     1--- openafs.spec.orig   2009-06-03 04:16:03.000000000 -0400
     2+++ openafs.spec        2009-06-12 02:05:57.000000000 -0400
    33@@ -8,7 +8,7 @@
    44 # for beta/rc releases make pkgrel 0.X.<tag>
    … …  
    1010 %if %{?osvers:0}%{!?osvers:1}
    1111 %define osvers 1
    12 @@ -261,6 +261,11 @@
     12@@ -261,6 +261,14 @@
    1313 %endif
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    … …  
    1818+Patch1002: openafs-pts-encrypt.patch
    1919+Patch1003: openafs-localcsdb.patch
     20+Patch1004: openafs-delta-dprintf-rename-20090427.patch
     21+Patch1005: openafs-numsysnames.patch
     22+Patch1006: openafs-delta-linux26-defer-cred-changing-20090511.patch
    2023+
    2124 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    2225 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2326 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    24 @@ -343,6 +348,7 @@
     27@@ -343,6 +351,7 @@
    2528 %if %{build_userspace}
    2629 
    … …  
    3033 
    3134 %if %{fedorakmod}
    32 @@ -403,6 +409,7 @@
     35@@ -403,6 +412,7 @@
    3336 
    3437 %if %{build_authlibs}
    … …  
    3841 Group: Networking/Filesystems
    3942 
    40 @@ -419,6 +426,7 @@
     43@@ -419,6 +429,7 @@
    4144 %endif
    4245 
    … …  
    4649 Requires: openafs-authlibs = %{PACKAGE_VERSION}
    4750 %endif
    48 @@ -437,6 +445,7 @@
     51@@ -437,6 +448,7 @@
    4952 libraries.
    5053 
    … …  
    5457 Group: Development/Filesystems
    5558 
    56 @@ -465,6 +474,7 @@
     59@@ -465,6 +477,7 @@
    5760 administrators.
    5861 
    … …  
    6265 Group: Networking/Filesystems
    6366 Provides: openafs-kernel = %{PACKAGE_VERSION}
    64 @@ -514,6 +524,7 @@
     67@@ -514,6 +527,7 @@
    6568 
    6669 %if %{krb5support}
    … …  
    7073 Requires: openafs = %{PACKAGE_VERSION}
    7174 Group: Networking/Filesystems
    72 @@ -540,7 +551,7 @@
     75@@ -540,7 +554,7 @@
    7376 %if %{build_modules}
    7477 
    … …  
    7982 %else
    8083 
    81 @@ -699,6 +710,10 @@
     84@@ -699,6 +713,13 @@
    8285 
    8386 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
    … …  
    8790+%patch1002 -p1 -b .pts-encrypt
    8891+%patch1003 -p1 -b .localcsdb
     92+%patch1004 -p1 -b .dprintf
     93+%patch1005 -p1 -b .numsysnames
     94+%patch1006 -p1 -b .defercredchanging
    8995 
    9096 ##############################################################################

  • trunk/server/fedora/specs/openssh.spec.patch

    r926 r1259  
    1 --- openssh.spec.orig   2009-01-01 21:06:01.000000000 -0500
    2 +++ openssh.spec        2009-01-01 22:52:02.000000000 -0500
     1--- openssh.spec-pristine       2009-07-01 18:55:04.579034598 -0400
     2+++ openssh.spec        2009-07-01 18:49:33.068037580 -0400
    33@@ -63,7 +63,7 @@
    4  Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
     4 Summary: An open source implementation of SSH protocol versions 1 and 2
    55 Name: openssh
    6  Version: 5.1p1
    7 -Release: 3%{?dist}%{?rescue_rel}
    8 +Release: 3%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
     6 Version: 5.2p1
     7-Release: 2%{?dist}%{?rescue_rel}
     8+Release: 2%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
    99 URL: http://www.openssh.com/portable.html
    1010 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
    1111 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
    12 @@ -74,6 +74,7 @@
     12@@ -74,6 +74,8 @@
    1313 Source1: openssh-nukeacss.sh
    1414 Source2: sshd.pam
    1515 Source3: sshd.init
    1616+Patch1000: openssh-5.0p1-multihomed.patch
    17  Patch0: openssh-5.1p1-redhat.patch
     17+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
     18 Patch0: openssh-5.2p1-redhat.patch
    1819 Patch2: openssh-5.1p1-skip-initial.patch
    1920 Patch3: openssh-3.8.1p1-krb5-config.patch
    20 @@ -159,6 +160,7 @@
     21@@ -160,6 +162,7 @@
    2122 Requires(post): chkconfig >= 0.9, /sbin/service
    2223 Requires(pre): /usr/sbin/useradd
    … …  
    2627 %package askpass
    2728 Summary: A passphrase dialog for OpenSSH and X
    28 @@ -232,6 +234,8 @@
    29  %patch63 -p1 -b .bannerlen
    30  %patch64 -p1 -b .compat-sessions
     29@@ -229,6 +232,9 @@
     30 %patch62 -p1 -b .manpage
     31 %patch65 -p1 -b .fips
    3132 
    3233+%patch1000 -p1 -b .multihomed
     34+%patch1001 -p1 -b .gssapi-env
    3335+
    3436 autoreconf

  • trunk/server/fedora/specs/php.spec.patch

    r1091 r1259  
    1 --- php.spec.orig       2009-04-23 11:58:08.000000000 -0400
    2 +++ php.spec    2009-04-23 12:00:32.000000000 -0400
     1--- php.spec.orig       2009-04-15 09:24:35.000000000 -0400
     2+++ php.spec    2009-06-03 05:40:37.000000000 -0400
    33@@ -7,7 +7,7 @@
    44 Summary: PHP scripting language for creating dynamic web sites
    … …  
    1010 Group: Development/Languages
    1111 URL: http://www.php.net/
    12 @@ -38,6 +38,10 @@
     12@@ -39,6 +39,10 @@
    1313 Patch60: php-5.2.7-tests-dashn.patch
    1414 Patch61: php-5.0.4-tests-wddx.patch
    … …  
    2121 
    2222 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, gmp-devel
    23 @@ -374,6 +378,8 @@
     23@@ -404,6 +408,8 @@
    2424 %patch60 -p1 -b .tests-dashn
    2525 %patch61 -p1 -b .tests-wddx

  • trunk/server/fedora/specs/scripts-base.spec

    r1236 r1259  
    99Source: %{name}.tar.gz
    1010BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
    11 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-pysvn, scripts-php, php_scripts
     11Requires: 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
    1212%define debug_package %{nil}
    1313
Note: See TracChangeset for help on using the changeset viewer.