Changeset 104


Ignore:
Timestamp:
Jan 20, 2007, 10:52:04 PM (17 years ago)
Author:
presbrey
Message:
upd-execsys bug fix
renamed staticsys-cat from sbin to bin to avoid selinux
Location:
server
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • server/common/oursrc/execsys/Makefile.in

    r89 r104  
    66sysconfdir = @sysconfdir@
    77APACHEDIR = /etc/httpd
    8 SYSCATPATH = /usr/local/sbin
     8SYSCATPATH = /usr/local/bin
    99
    10 all-local: staticsys-cat execsys-binfmt
     10all-local: static-cat execsys-binfmt
    1111
    12 staticsys-cat.c execsys-binfmt: staticsys-cat.c.pre execsys-binfmt.pre
    13         @UPD_VARS@ syscat_path=$(SYSCATPATH) perl upd-execsys
     12static-cat.c execsys-binfmt: static-cat.c.pre execsys-binfmt.pre
     13        @UPD_VARS@ syscat_path=$(SYSCATPATH)/static-cat perl upd-execsys
    1414
    1515install: all-local
    1616        install -D -p -m644 execsys.conf $(DESTDIR)$(APACHEDIR)/conf.d/execsys.conf
    1717        install -D -p -m755 execsys-binfmt $(DESTDIR)/etc/init.d/execsys-binfmt
    18         install -D -p -m755 staticsys-cat $(DESTDIR)$(SYSCATPATH)/staticsys-cat
     18        install -D -p -m755 static-cat $(DESTDIR)$(SYSCATPATH)/static-cat
    1919
    2020clean:
    21         rm -f staticsys-cat
     21        rm -f static-cat
    2222
    2323distclean: clean
  • server/common/oursrc/execsys/configure.in

    r87 r104  
    1 AC_INIT(staticsys-cat.c.pre)
     1AC_INIT(static-cat.c.pre)
    22
    33AC_PROG_CC
  • server/common/oursrc/execsys/mrproper

    r36 r104  
    11#!/bin/sh
    22
    3 rm -f staticsys-cat
     3rm -f static-cat
    44rm -f configure config.* Makefile
    55rm -rf auto*.cache
  • server/common/oursrc/execsys/static-cat.c.pre

    r103 r104  
    11/*
    2  * staticsys-cat
     2 * static-cat
    33 * Copyright (C) 2006  Jeff Arnold <jbarnold@mit.edu>
    44 *
  • server/common/oursrc/execsys/upd-execsys

    r26 r104  
    107107close(CONF);
    108108
    109 open(CAT, "./staticsys-cat.c.pre");
     109open(CAT, "./static-cat.c.pre");
    110110$file = <CAT>;
    111111($fstart, $fend) = ($file =~ /$regexp/s);
    112112close(CAT);
    113113
    114 open(CAT, ">./staticsys-cat.c");
     114open(CAT, ">./static-cat.c");
    115115print CAT $fstart, "\n";
    116116print CAT '#define NEXTS ', scalar(@static), "\n";
  • server/fedora/specs/execsys.spec

    r89 r104  
    1717 - Apache configuration file <execsys.conf>
    1818 - binfmt_misc init script <execsys-binfmt>
    19  - Binary for serving static content <staticsys-cat>
     19 - Binary for serving static content <static-cat>
    2020See http://scripts.mit.edu/wiki for more information.
    2121
     
    3838/etc/httpd/conf.d/execsys.conf
    3939%defattr(0755, root, root)
    40 /usr/local/sbin/staticsys-cat
     40/usr/local/bin/static-cat
    4141/etc/init.d/execsys-binfmt
    4242
Note: See TracChangeset for help on using the changeset viewer.