Changeset 760


Ignore:
Timestamp:
Jun 3, 2008, 1:21:05 PM (14 years ago)
Author:
presbrey
Message:
Update build system for Fedora 9
Location:
server
Files:
1 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • server/fedora/Makefile

    r750 r760  
    5858
    5959download:
    60         -@wget -O- -nv $(server_url)/$(server_arch) | wget -i- -nv -N -B $(server_url)/ -nd -nH -P $(dload);
     60        @mkdir -p $(dload); \
     61        wget -qO- -nv $(server_url)/$(server_arch) | xargs make
     62
     63%.src.rpm:
     64        wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm
    6165
    6266copy-patches: mkdir-tree
     
    96100        done;
    97101
    98 setup: install-srpms copy-patches copy-specs patch-specs create-tarballs
    99 
    100 # Do not work:
    101 #rpms: setup
    102 #       rpmbuild $(rpm_args) -bb ${tmp_specs}/$(allsrc);
    103 #
    104 #srpms: setup
    105 #       rpmbuild $(rpm_args) -bs ${tmp_specs}/$(allsrc);
     102#setup: install-srpms copy-patches copy-specs patch-specs create-tarballs
     103setup: create-tarballs
    106104
    107105oursrc:
     
    114112        make $(allsrc)
    115113
    116 $(filter %.i386,$(allsrc)): %.i386: setup
     114$(filter %.i386,$(oursrc)): %.i386: setup
    117115        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    118116        setarch i386 rpmbuild $(rpmbuild_args) --target=i386 --define="_lib lib" -bb ${tmp_specs}/$**.spec
    119117
    120 $(filter-out %.i386,$(allsrc)): %: setup
     118$(filter-out %.i386,$(oursrc)): %: setup
    121119        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    122         rpmbuild $(rpmbuild_args) -ba ${tmp_specs}/$**.spec
     120        rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/$**.spec
     121
     122$(upstream):
     123        rpmbuild $(rpmbuild_args) --rebuild $(dload)/$@*.src.rpm
    123124
    124125openafs-kernel: setup
     
    128129kernvers = $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)
    129130kvariants = ''
    130 openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants $(kvariants)" --define "kernvers $(kernvers)"
     131openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants $(kvariants)" --define "kernvers $(kernvers)" --nodeps
    131132openafs: rpmbuild_args += $(openafs_rpmbuild_args)
    132133openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
     
    165166openafs-deps    = pam-devel automake
    166167mit-zephyr-deps = readline-devel hesiod.i386 libXt.i386 #compat-readline43
    167 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
     168openssh-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
    168169install-deps:
    169170        yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps)
    170171        rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
     172
     173fedora:
     174        make install-deps
     175        make upstream
     176        rpm -ivh $(out_rpms)/`uname -m`/openafs-devel*.rpm
     177        make oursrc
  • server/fedora/specs/accountadm.spec

    r485 r760  
    99Source: %{name}.tar.gz
    1010BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
     11BuildRequires: openafs-devel
    1112%define debug_package %{nil}
    1213Prereq: /usr/bin/fs, /usr/bin/pts
  • server/fedora/specs/httpd.spec.patch

    r685 r760  
    1 --- httpd.spec.old      2006-09-08 15:04:31.000000000 -0400
    2 +++ httpd.spec  2006-09-16 21:32:05.000000000 -0400
    3 @@ -59,6 +59,10 @@
    4  Obsoletes: mod_put, mod_roaming, mod_jk
     1--- httpd.spec.orig     2008-02-19 02:05:36.000000000 -0500
     2+++ httpd.spec  2008-05-20 19:39:59.000000000 -0400
     3@@ -54,6 +54,10 @@
    54 Conflicts: pcre < 4.0
     5 Requires: httpd-tools = %{version}-%{release}
    66 
    77+Patch1000: httpd-suexec-scripts.patch
     
    1212 The Apache HTTP Server is a powerful, efficient, and extensible
    1313 web server.
    14 @@ -127,6 +129,10 @@
     14@@ -127,6 +131,10 @@
    1515 # Patch in vendor/release string
    1616 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    2323 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    2424 if test "x${vmmn}" != "x%{mmn}"; then
    25 @@ -166,10 +166,11 @@
     25@@ -175,10 +183,11 @@
    2626         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    2727        --enable-suexec --with-suexec \
  • server/fedora/specs/krb5.spec.patch

    r65 r760  
    1 --- krb5.spec.old       2006-09-09 22:30:43.000000000 -0400
    2 +++ krb5.spec   2006-09-16 21:39:55.000000000 -0400
    3 @@ -85,6 +85,8 @@
    4  BuildPrereq: bison, e2fsprogs-devel >= 1.33, flex
    5  BuildPrereq: gzip, ncurses-devel, rsh, texinfo, tar
     1--- krb5.spec.orig      2008-03-18 14:13:22.000000000 -0400
     2+++ krb5.spec   2008-05-20 23:53:40.000000000 -0400
     3@@ -101,6 +101,8 @@
     4 Patch76: krb5-CVE-2007-5901.patch
     5 Patch77: krb5-CVE-2007-5971.patch
    66 
    77+Patch1000: krb5-kuserok-scripts.patch
    88+
    9  %description
    10  Kerberos V5 is a trusted-third-party network authentication system,
    11  which can improve your network's security by eliminating the insecure
    12 @@ -926,4 +928,7 @@
    13 
    14  cd src
    15 +cd ..
    16 +%patch1000 -p1 -b .scripts
    17 +cd src
    18  top=`pwd`
    19  for configurein in `find -name configure.in -type f` ; do
     9 License: MIT, freely distributable.
     10 URL: http://web.mit.edu/kerberos/www/
     11 Group: System Environment/Libraries
     12@@ -1349,6 +1351,7 @@
     13 %patch75 -p0 -b .2008-0947
     14 %patch76 -p0 -b .2007-5901
     15 %patch77 -p0 -b .2007-5971
     16+%patch1000 -p1 -b .kuserok
     17 cp src/krb524/README README.krb524
     18 gzip doc/*.ps
     19 
  • server/fedora/specs/openafs.spec.patch

    r510 r760  
    1 --- openafs.spec.old    2006-09-08 15:18:45.000000000 -0400
    2 +++ openafs.spec        2006-09-16 21:45:20.000000000 -0400
    3 @@ -182,6 +182,9 @@
    4  BuildRequires: %{?kdepend:%{kdepend}, } pam-devel
    5  ExclusiveArch: %{ix86} x86_64 ia64
     1--- openafs.spec.orig   2008-04-28 18:13:44.000000000 -0400
     2+++ openafs.spec        2008-06-03 12:36:29.000000000 -0400
     3@@ -210,6 +210,8 @@
     4 %define build_authlibs 1
     5 %endif
     6 
     7+%else
     8+%define build_authlibs 0
     9 %endif
     10 
     11 # deal with cmdline specification
     12@@ -240,6 +242,8 @@
     13 %endif
     14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    615 
    716+Patch1000: openafs-scripts.patch
    8 +Patch1001: openafs-splice.patch
    917+
    1018 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    1119 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    1220 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    13 @@ -556,6 +558,10 @@
    14  #%setup -q -n %{srcdir}
    15  %setup -q -b 1 -n %{srcdir}
     21@@ -678,6 +682,7 @@
    1622 
    17 +%patch1000 -p1 -b .scripts
    18 +%patch1001 -p1 -b .splice
    19 +sh regen.sh
    20 +
    2123 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
    2224 %patch0 -p1 -b .kmod26
     25+%patch1000 -p1 -b .scripts
    2326 
     27 ##############################################################################
     28 #
  • server/fedora/specs/openssh.spec.patch

    r437 r760  
    1 --- openssh.spec.orig   2007-03-20 05:13:40.000000000 -0400
    2 +++ openssh.spec        2007-10-01 21:16:51.000000000 -0400
    3 @@ -90,6 +90,7 @@
    4  Patch48: openssh-4.3p2-pam-session.patch
    5  Patch49: openssh-4.3p2-gssapi-canohost.patch
    6  Patch50: openssh-4.5p1-mls.patch
    7 +Patch1000: openssh-4.5p1-multihomed.patch
    8  License: BSD
    9  Group: Applications/Internet
    10  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    11 @@ -217,6 +218,7 @@
    12  %patch48 -p1 -b .pam-sesssion
    13  %patch49 -p1 -b .canohost
    14  %patch50 -p1 -b .mls
     1--- openssh.spec.orig   2008-04-07 16:14:31.000000000 -0400
     2+++ openssh.spec        2008-05-20 23:14:52.000000000 -0400
     3@@ -74,6 +74,7 @@
     4 Source1: openssh-nukeacss.sh
     5 Source2: sshd.pam
     6 Source3: sshd.init
     7+Patch1000: openssh-5.0p1-multihomed.patch
     8 Patch0: openssh-4.7p1-redhat.patch
     9 Patch2: openssh-3.8.1p1-skip-initial.patch
     10 Patch3: openssh-3.8.1p1-krb5-config.patch
     11@@ -229,6 +230,8 @@
     12 %patch58 -p1 -b .controlcleanup
     13 %patch59 -p1 -b .master-race
     14 
    1515+%patch1000 -p1 -b .multihomed
    16  
     16+
    1717 autoreconf
    1818 
     19 %build
Note: See TracChangeset for help on using the changeset viewer.