Changeset 2836 for trunk


Ignore:
Timestamp:
Apr 10, 2017, 4:34:07 AM (7 years ago)
Author:
andersk
Message:
Remove the old C version of static-cat
Location:
trunk/server
Files:
1 added
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/server/common/oursrc/execsys/Makefile.in

    r1358 r2836  
    66sysconfdir = @sysconfdir@
    77sbindir = @sbindir@
    8 APACHEDIR = /etc/httpd
    9 SYSCATPATH = /usr/local/bin
    108trusteddir = /usr/libexec/scripts-trusted
    119
    12 all-local: static-cat
     10all-local:
    1311
    14 static-cat.c: static-cat.c.pre
    15         syscat_path=$(SYSCATPATH)/static-cat perl upd-execsys
    16 
    17 install: all-local
    18         install -D -p -m644 execsys.conf $(DESTDIR)$(APACHEDIR)/conf.d/execsys.conf
     12install:
    1913        install -D -p -m755 execsys-binfmt $(DESTDIR)/etc/init.d/execsys-binfmt
    20         install -D -p -m755 static-cat $(DESTDIR)$(SYSCATPATH)/static-cat
    2114        install -D -p -m755 ldapize.pl $(DESTDIR)$(sbindir)/ldapize.pl
    2215

  • trunk/server/common/oursrc/execsys/configure.in

    r1337 r2836  
    1 AC_INIT(static-cat.c.pre)
     1AC_INIT([Makefile.in])
    22
    33AC_PROG_CC

  • trunk/server/common/oursrc/execsys/mrproper

    r1337 r2836  
    11#!/bin/sh
    22
    3 rm -f static-cat
    43rm -f configure config.* Makefile
    5 rm -f static-cat.c execsys.conf
    64rm -rf auto*.cache

  • trunk/server/doc/adding-static-exts

    r2831 r2836  
    111. Update server/common/patches/httpd-suexec-scripts.patch,
    2    server/common/oursrc/execsys/upd-execsys, and
     2   server/fedora/conf/etc/httpd/conf.d/execsys.conf, and
    33   server/common/oursrc/scripts-static-cat/StaticCat.hs.
    442. Following the directions in the package-build-howto document, build
    5    new httpd, execsys, and scripts-static-cat packages, upload them to
     5   new httpd and scripts-static-cat packages, upload them to
    66   the repo, and deploy them to the servers.

  • trunk/server/fedora/specs/execsys.spec

    r926 r2836  
    2626%build
    2727./configure --prefix=/usr/local --with-pl=/usr/bin/perl --with-php=/usr/bin/php-cgi --with-py=/usr/bin/python --with-exe=/usr/bin/mono
    28 make SYSCATDIR=/usr/local/sbin
     28make
    2929
    3030%install
    3131[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
    32 make install DESTDIR=$RPM_BUILD_ROOT SYSCATDIR=/usr/local/sbin
     32make install DESTDIR=$RPM_BUILD_ROOT
    3333
    3434%clean
    … …  
    3636
    3737%files
    38 %defattr(0644, root, root)
    39 /etc/httpd/conf.d/execsys.conf
    4038%defattr(0755, root, root)
    41 /usr/local/bin/static-cat
    4239/etc/init.d/execsys-binfmt
    4340/usr/local/sbin/ldapize.pl
Note: See TracChangeset for help on using the changeset viewer.