Changeset 100

Show
Ignore:
Timestamp:
10/30/07 09:59:16 (1 year ago)
Author:
jjarrett
Message:

added logic to support single command building of complete system

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RHEL4/Makefile

    r29 r100  
    1 SUBDIRS=scripts conf man 
     1SUBDIRS=scripts conf man  
     2 
    23 
    34export PREFIX=/usr 
    …… 
    1415                ($(MAKE) -C $$i install); \ 
    1516        done 
     17        echo "Done SUBDIRS processing..."  
    1618        test -d $(DESTDIR)$(KSDIR) || install -m 755 -d $(DESTDIR)$(KSDIR) 
    1719        test -d $(DESTDIR)$(CONFDIR) || install -m 755 -d $(DESTDIR)$(CONFDIR) 
    1820        install -m 644 kickstart/* $(DESTDIR)$(KSDIR) 
    1921 
     22 
     23 
     24 

  • trunk/RHEL4/RPM/clip.spec

    r9 r100  
    22Name: clip 
    33Version: 1.0 
    4 Release: 4 
     4Release: 5 
    55License: GPL 
    66Group: System Environment/Base 
    …… 
    4646/usr/share/clip/man/man8/xar.8 
    4747/usr/share/clip/man/man8/integrity.8 
     48/usr/share/clip/scripts/stig-fix 
     49#/usr/share/clip/scripts/stig-fix/run-fixes.sh 
     50#/usr/share/clip/scripts/stig-fix/cat1/gen004640.sh 
     51#/usr/share/clip/scripts/stig-fix/cat1/lnx00320.sh 
     52#/usr/share/clip/scripts/stig-fix/cat1/lnx00580.sh 
     53#/usr/share/clip/scripts/stig-fix/cat2/gen000020.sh 
     54#/usr/share/clip/scripts/stig-fix/cat2/gen000460.sh 
     55#/usr/share/clip/scripts/stig-fix/cat2/gen000600.sh 
     56#/usr/share/clip/scripts/stig-fix/cat2/gen000920.sh 
     57#/usr/share/clip/scripts/stig-fix/cat2/gen001260.sh 
     58#/usr/share/clip/scripts/stig-fix/cat2/gen002820.sh 
     59#/usr/share/clip/scripts/stig-fix/cat2/gen003320.sh 
     60#/usr/share/clip/scripts/stig-fix/cat2/gen003865.sh 
     61#/usr/share/clip/scripts/stig-fix/cat2/gen004820.sh 
     62#/usr/share/clip/scripts/stig-fix/cat2/lnx00340.sh 
     63#/usr/share/clip/scripts/stig-fix/cat2/gen000400.sh 
     64#/usr/share/clip/scripts/stig-fix/cat2/gen005400.sh 
     65#/usr/share/clip/scripts/stig-fix/cat2/lnx00440.sh 
     66#/usr/share/clip/scripts/stig-fix/cat2/gen000480.sh 
     67#/usr/share/clip/scripts/stig-fix/cat2/gen000800.sh 
     68#/usr/share/clip/scripts/stig-fix/cat2/gen000980.sh 
     69#/usr/share/clip/scripts/stig-fix/cat2/gen002320.sh 
     70#/usr/share/clip/scripts/stig-fix/cat2/gen002960.sh 
     71#/usr/share/clip/scripts/stig-fix/cat2/gen003600.sh 
     72#/usr/share/clip/scripts/stig-fix/cat2/gen004000.sh 
     73#/usr/share/clip/scripts/stig-fix/cat2/gen000440.sh 
     74#/usr/share/clip/scripts/stig-fix/cat2/gen000580.sh 
     75#/usr/share/clip/scripts/stig-fix/cat2/gen000820.sh 
     76#/usr/share/clip/scripts/stig-fix/cat2/gen001020.sh 
     77#/usr/share/clip/scripts/stig-fix/cat2/gen002560.sh 
     78#/usr/share/clip/scripts/stig-fix/cat2/gen003080.sh 
     79#/usr/share/clip/scripts/stig-fix/cat2/gen003740.sh 
     80#/usr/share/clip/scripts/stig-fix/cat2/gen004540.sh 
     81#/usr/share/clip/scripts/stig-fix/cat2/gen006620.sh 
     82#/usr/share/clip/scripts/stig-fix/cat2/lnx00520.sh 
     83#/usr/share/clip/scripts/stig-fix/cat3/gen001280.sh 
     84#/usr/share/clip/scripts/stig-fix/cat3/gen003520.sh 
     85#/usr/share/clip/scripts/stig-fix/cat3/gen004560.sh 
    4886/etc/integrity.conf 
    4987/etc/security/pam_env.conf 

  • trunk/RHEL4/conf/pam/login.pam

    r99 r100  
    11#%PAM-1.0 
    2 auth       required     pam_securetty.so 
    3 auth       required     pam_stack.so service=system-auth 
    4 account    required     pam_nologin.so 
     2auth       required     /lib/security/$ISA/pam_securetty.so 
     3auth       required     /lib/security/$ISA/pam_stack.so service=system-auth 
     4account    required     /lib/security/$ISA/pam_nologin.so 
    55 
    6 account    required     pam_stack.so service=system-auth 
     6account    required     /lib/security/$ISA/pam_stack.so service=system-auth 
    77 
    8 password   required     pam_stack.so service=system-auth 
     8password   required     /lib/security/$ISA/pam_stack.so service=system-auth 
    99# pam_selinux.so close should be the first session rule 
    1010 
    11 session    required     pam_selinux.so close 
    12 session    required     pam_stack.so service=system-auth 
    13 session    required     pam_unix.so 
    14 session    required     pam_loginuid.so require_auditd 
     11session    required     /lib/security/$ISA/pam_selinux.so close 
     12session    required     /lib/security/$ISA/pam_stack.so service=system-auth 
     13session    required     /lib/security/$ISA/pam_unix.so 
     14session    required     /lib/security/$ISA/pam_loginuid.so require_auditd 
    1515# pam_selinux.so open should be the last session rule 
    16 session    required     pam_selinux.so open 
     16session    required     /lib/security/$ISA/pam_selinux.so open 

  • trunk/RHEL4/conf/pam/newrole.pam

    r1 r100  
    11#%PAM-1.0 
    2 auth       required     pam_stack.so service=system-auth 
    3 account    required     pam_stack.so service=system-auth 
    4 password   required     pam_stack.so service=system-auth 
    5 session    required     pam_stack.so service=system-auth 
     2auth       required     /lib/security/$ISA/pam_stack.so service=system-auth 
     3account    required     /lib/security/$ISA/pam_stack.so service=system-auth 
     4password   required     /lib/security/$ISA/pam_stack.so service=system-auth 
     5session    required     /lib/security/$ISA/pam_stack.so service=system-auth 

  • trunk/RHEL4/conf/pam/sshd.pam

    r1 r100  
    11#%PAM-1.0 
    22 
    3 auth            required        pam_stack.so service=system-auth 
    4 account         required        pam_stack.so service=system-auth 
    5 password        required        pam_stack.so service=system-auth 
    6 session         required        pam_stack.so service=system-auth 
    7 session         required        pam_loginuid.so require_auditd 
     3auth            required        /lib/security/$ISA/pam_stack.so service=system-auth 
     4account         required        /lib/security/$ISA/pam_stack.so service=system-auth 
     5password        required        /lib/security/$ISA/pam_stack.so service=system-auth 
     6session         required        /lib/security/$ISA/pam_stack.so service=system-auth 
     7session         required        /lib/security/$ISA/pam_loginuid.so require_auditd 

  • trunk/RHEL4/conf/pam/su.pam

    r1 r100  
    11#%PAM-1.0 
    2 auth            sufficient      pam_rootok.so 
     2auth            sufficient      /lib/security/$ISA/pam_rootok.so 
    33# Uncomment the following line to implicitly trust users in the "wheel" group. 
    4 #auth           sufficient      pam_wheel.so trust use_uid 
     4#auth           sufficient      /lib/security/$ISA/pam_wheel.so trust use_uid 
    55# Uncomment the following line to require a user to be in the "wheel" group. 
    6 auth            required        pam_wheel.so use_uid 
    7 auth            required        pam_tally.so retry=3 onerr=fail 
    8 auth            required        pam_stack.so service=system-auth 
    9 account         required        pam_stack.so service=system-auth 
    10 password        required        pam_stack.so service=system-auth 
    11 session         required        pam_stack.so service=system-auth 
     6auth            required        /lib/security/$ISA/pam_wheel.so use_uid 
     7auth            required        /lib/security/$ISA/pam_tally.so retry=3 onerr=fail 
     8auth            required        /lib/security/$ISA/pam_stack.so service=system-auth 
     9account         required        /lib/security/$ISA/pam_stack.so service=system-auth 
     10password        required        /lib/security/$ISA/pam_stack.so service=system-auth 
     11session         required        /lib/security/$ISA/pam_stack.so service=system-auth 

  • trunk/RHEL4/conf/pam/sudo.pam

    r1 r100  
    11#%PAM-1.0 
    2 auth       required     pam_stack.so service=system-auth 
    3 account    required     pam_stack.so service=system-auth 
    4 password   required     pam_stack.so service=system-auth 
    5 session    required     pam_limits.so 
     2auth       required     /lib/security/$ISA/pam_stack.so service=system-auth 
     3account    required     /lib/security/$ISA/pam_stack.so service=system-auth 
     4password   required     /lib/security/$ISA/pam_stack.so service=system-auth 
     5session    required     /lib/security/$ISA/pam_limits.so 

  • trunk/RHEL4/conf/pam/system-auth.pam

    r1 r100  
    33# User changes will be destroyed the next time authconfig is run. 
    44 
    5 auth            required        pam_tally.so deny=5 onerr=fail 
    6 auth            required        pam_env.so 
    7 auth            required        pam_unix.so likeauth nullok audit 
     5auth            required        /lib/security/$ISA/pam_tally.so deny=5 onerr=fail 
     6auth            required        /lib/security/$ISA/pam_env.so 
     7auth            required        /lib/security/$ISA/pam_unix.so likeauth nullok audit 
    88 
    9 account         required        pam_unix.so 
    10 account         required        pam_tally.so 
     9account         required        /lib/security/$ISA/pam_unix.so 
     10account         required        /lib/security/$ISA/pam_tally.so 
    1111 
    12 password        required        pam_cracklib.so       retry=3 minlen=8 difok=3 \ 
     12password        required        /lib/security/$ISA/pam_cracklib.so    retry=3 minlen=8 difok=3 \ 
    1313                                dcredit=0 ucredit=0 ocredit=0 lcredit=0 
    14 password        required        pam_unix.so nullok use_authtok md5 \ 
     14password        required        /lib/security/$ISA/pam_unix.so nullok use_authtok md5 \ 
    1515                                remember=3 
    1616 
    17 session         required        pam_limits.so 
    18 session         required        pam_unix.so 
     17session         required        /lib/security/$ISA/pam_limits.so 
     18session         required        /lib/security/$ISA/pam_unix.so 
    1919 
    2020 

  • trunk/RHEL4/kickstart/clip.ks

    r18 r100  
    99text 
    1010skipx 
    11 rootpw password 
     11rootpw 123)(*qweASD 
     12bootloader --location=mbr --password=123)(*qweASD 
     13 
     14################ 
     15# Partitioning # 
     16################ 
     17 
     18clearpart --linux 
     19part /boot --size=100 
     20part swap  --recommended 
     21part pv.01 --size=1 --grow 
     22volgroup clipvg pv.01 
     23# Using Logical Volume Management lets the user resize partitions later. 
     24# STIG requires separate /var and /home. 
     25logvol /var  --vgname=clipvg --size=1000     --name=var 
     26logvol /home --vgname=clipvg --size=1000     --name=home 
     27logvol /     --vgname=clipvg --size=1 --grow --name=root 
    1228 
    1329#################### 

  • trunk/RHEL4/refpolicy/build/Makefile

    r11 r100  
    2626# bump this if creating multiple releases from the same  
    2727# version (think about this... why are you doing this?) 
    28 RELEASE ?= 1 
     28RELEASE ?= 5 
    2929 
    3030# change this to "y" to build a src rpm 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/Changelog

    r17 r100  
     1* Fri Oct 05 2007 Jonathan Jarrett <selinux@tresys.com> - 20071005 
     2- Added another user to support modifications to bring CLIP into STIG Compliance  
     3 
    14- Move program admin template usage out of userdom_admin_user_template() to 
    25  sysadm policy in userdomain.te to fix usage of the template for third 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/VERSION

    r13 r100  
    1 20070417 
     120071005 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/config/appconfig-strict-mcs/seusers

    r92 r100  
    11system_u:system_u:s0-mcs_systemhigh 
    22root:root:s0-mcs_systemhigh 
     3CLIPUser:staff_u:s0 
    34__default__:user_u:s0 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/config/appconfig-strict-mls/seusers

    r92 r100  
    11system_u:system_u:s0-mls_systemhigh 
    22root:root:s0-mls_systemhigh 
     3CLIPUser:staff_u:s0 
    34__default__:user_u:s0 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/config/appconfig-strict/seusers

    r92 r100  
    11system_u:system_u 
    22root:root 
     3CLIPUser:staff_u 
    34__default__:user_u 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/config/appconfig-targeted-mcs/seusers

    r11 r100  
    11root:root:s0-mcs_systemhigh 
     2CLIPUser:staff_u:s0 
    23__default__:user_u:s0 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/config/appconfig-targeted-mls/seusers

    r11 r100  
    11root:root:s0-mls_systemhigh 
     2CLIPUser:staff_u:s0 
    23__default__:user_u:s0 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/config/appconfig-targeted/seusers

    r1 r100  
    11root:root 
     2CLIPUser:staff_u 
    23__default__:user_u 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/config/local.users

    r1 r100  
    2020# sample for regular user 
    2121#user jdoe roles { user_r };  
     22 
     23# STIG User account 
     24user CLIPUser roles { staff_r }; 
     25 

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/policy/rolemap

    r1 r100  
    1919        ') 
    2020') 
     21 
     22 ifdef(`clip',` 
     23        user_r user user_t 
     24        staff_r staff staff_t 
     25        sysadm_r sysadm sysadm_t 
     26 
     27        ifdef(`enable_mls',` 
     28                secadm_r secadm secadm_t 
     29                auditadm_r auditadm auditadm_t 
     30        ') 
     31') 
     32  

  • trunk/RHEL4/refpolicy/src/selinux-policy-clip/policy/users

    r11 r100  
    4949                gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats) 
    5050        ') 
     51gen_user(CLIPUser, staff, staff_r sysadm_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)      
    5152') 

  • trunk/RHEL4/rpmify

    r30 r100  
    22 
    33VERSION="1.0" 
    4 RELEASE="4" 
     4RELEASE="5" 
    55 
    6 tar --exclude="*.svn*" -czvf RPM/clip-$VERSION-$RELEASE.tar.gz conf/ kickstart/ scripts/ man/ Makefile 
    7 sudo cp RPM/clip-$VERSION-$RELEASE.tar.gz /usr/src/redhat/SOURCES 
    8 sudo rpmbuild -ba RPM/clip.spec 
    9 cp /usr/src/redhat/RPMS/noarch/clip-$VERSION-$RELEASE.noarch.rpm RPM/ 
     6echo "Starting rpmify - generating archive" 
     7rm -f $DESTDIR/clip-$VERSION-$RELEASE.tar.gz 
     8tar --exclude="*.svn*" -czvf $DESTDIR/clip-$VERSION-$RELEASE.tar.gz conf/ kickstart/ scripts/ man/ Makefile 
     9cp $DESTDIR/clip-$VERSION-$RELEASE.tar.gz $DESTDIR/SOURCES 
     10echo "Building RPM..." 
     11rpmbuild --clean RPM/clip.spec 
     12rpmbuild -ba RPM/clip.spec 
     13echo "Preparing output..." 
     14cp $DESTDIR/RPMS/noarch/clip-$VERSION-$RELEASE.noarch.rpm $DESTDIR 
     15echo "Completed..." 

  • trunk/RHEL4/scripts/Makefile

    r9 r100  
    1212                $(DESTDIR)$(SHAREDIR)/wrappers 
    1313        install -m 644 *.conf $(DESTDIR)$(SYSCONFDIR) 
     14        test -d $(DESTDIR)$(SHAREDIR)/scripts/ || install -m 755 -d \ 
     15                $(DESTDIR)$(SHAREDIR)/scripts 
     16        test -d $(DESTDIR)$(SHAREDIR)/scripts/stig-fix|| install -m 755 -d \ 
     17                $(DESTDIR)$(SHAREDIR)/scripts/stig-fix  
     18        test -d $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat1 || install -m 755 -d \ 
     19                $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat1 
     20        test -d $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat2 || install -m 755 -d \ 
     21                $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat2 
     22        test -d $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat3 || install -m 755 -d \ 
     23                $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat3 
     24 
     25 
     26 
    1427 
    1528        # Install scripts and data directories 
    …… 
    2336        install -m 644 wrappers/wrapper.c $(DESTDIR)$(SHAREDIR)/wrappers 
    2437 
     38        # Install scripts 
     39        install -m 700 stig-fix/run-fixes.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix  
     40        install -m 700 stig-fix/cat1/*.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat1  
     41        install -m 700 stig-fix/cat2/*.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat2  
     42        install -m 700 stig-fix/cat3/*.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat3  
     43 
    2544        # Patch installer  
    2645        perl -pe s!--BASE--!$(PREFIX)/share! < $(INSTALLER).in > \ 

  • trunk/RHEL4/scripts/installer.in

    r10 r100  
    77PAMDIR=$BASE/clip/conf/pam 
    88MANDIR=$BASE/clip/man/man8 
    9  
     9STIGFIXDIR=$BASE/clip/scripts/stig-fix  # It is assumed that a file named  
     10                                        # run-fixes.sh exists in  
     11                                        # STIGFIXDIR. 
    1012Copy() { 
    1113    local src=$1 dst=$2 
    …… 
    5557} 
    5658 
     59# Install a collection of scripts to make CLIP  
     60# STIG-compliant.  
     61# Since these scripts are not likely to be found on the system, 
     62# cp and not Copy() is used to install these files.  
     63InstallStig() { 
     64        for d in $(ls -R STIGFIXDIR); do 
     65                cp -r $d /usr/share/clip/scripts/stig-fix &2>/dev/null 
     66        done 
     67} 
     68 
     69# Run the scripts installed in InstallStig. 
     70# This function assumes that a file named run-fixes.sh has been installed 
     71# in STIGFIXDIR, and is executable by root; this happens in InstallStig. 
     72# run-fixes.sh is used to launch the individual scripts. 
     73RunStigFixes() { 
     74        if [ -x $STIGFIXDIR/run-fixes.sh ]; then 
     75                echo "Running STIG fix script." 
     76                $STIGFIXDIR/run-fixes.sh 
     77        else 
     78                echo "Could not locate STIG fix script." 
     79        fi 
     80} 
     81 
    5782cat <<EOM 
    5883Certifiable Linux Integration Platform Installation Log 
    …… 
    6792InstallPam 
    6893InstallMan 
     94InstallStig 
     95RunStigFixes 

  • trunk/RHEL4/scripts/xar

    r1 r100  
    3535    "-r        restore file contexts\n" 
    3636    "-e        restore the context of <filename>\n" 
    37     "-v        verbose output" 
     37    "-v        verbose output\n" 
    3838    "-h        display this menu") 
    3939 
    …… 
    4747        return False 
    4848    elif re.match('^/selinux(/.*)?', path): 
     49        return False 
     50    elif re.match('^/dev(/.*)?', path): 
    4951        return False 
    5052    return True 
    …… 
    6668        print "Indexing extended attributes..." 
    6769     
    68     # Traverse the root directory, running indexcon on each subdir 
     70   #Do the find once outside the for loop to catch any non-dir files in the root 
     71    cmd_str= "find '%s' -maxdepth 1 ! -type d -printf \'%%Z\t%%p\\n' 2>/dev/null >> %s" % \ 
     72              (root, ctx_file) 
     73    if verbose: 
     74        print path 
     75    os.system(cmd_str) 
     76     
     77    # Traverse the root directory, running find non-recursively on each subdir 
     78 
    6979    for root, dirs, files in os.walk(root):         
    7080        for dirname in dirs: 
    7181            path = os.path.join(root,dirname) 
    72              
    7382            # Check to see that the path isn't one we're excluding 
    7483            if is_legal_path(path): 
    75                 cmd_str = "indexcon %s -d'%s' &>/dev/null" % \ 
    76                           (INDEXCON_OUTFILE, path)     
    77                 if verbose: 
     84                #output in the form of  
     85                #user_u:object_r:file_t<tab>/path/to/file 
     86                cmd_str= "find '%s' -maxdepth 1 -printf '%%Z\t%%p\\n' 2>/dev/null >> %s" % \ 
     87                          (path, ctx_file) 
     88                if verbose: 
    7889                    print path 
    7990                os.system(cmd_str) 
    8091 
    81                 # Verify that indexcon succeeded 
    82                 if not os.path.isfile(INDEXCON_OUTFILE): 
     92                # Verify that archive succeeded 
     93                if not os.path.isfile(ctx_file): 
    8394                    print "ERROR: indexing of %s failed" % \ 
    8495                          os.path.join(root,dirname) 
    8596                    continue  
    8697 
    87                 # Run searchcon on indexcon's output to generate something 
    88                 # that can be parsed in relabel() 
    89                 cmd_str = "searchcon %s >> %s" % (INDEXCON_OUTFILE, ctx_file) 
    90                 os.system(cmd_str) 
    91  
    92                 # Remove the temporary file generated by indexcon 
    93                 os.remove(INDEXCON_OUTFILE); 
    9498            else: 
    9599                # Don't process any other entries in this directory 
    …… 
    97101 
    98102def update_ctx(filename, ctx): 
    99     cmd = "chcon %s %s" % (ctx, filename) 
     103    cmd = "chcon %s '%s'" % (ctx, filename) 
    100104    os.system(cmd) 
    101105 
    102106def relabel_file(filename, ctx_file): 
     107    #GIANT FIXME: individual file relabeling doesn't appear to work 
     108    #and has been disabled.  probably something trivial... 
    103109    try: 
    104110        ifile = open(ctx_file, 'r') 
    …… 
    110116    regex = re.compile('\.\/', re.VERBOSE) 
    111117    for l in lines: 
    112         vals = re.split("\s", l) 
    113         ctx = vals[0]; path = vals[2] 
    114         # Remove trailing './' from entries in the cwd 
    115         clean_path = regex.sub('', path) 
     118         
     119        #ZJC Grab the filename, context from the line 
     120        #remove whitespace (eol markers, etc) from line start/end 
     121        l=l.strip() 
     122         
     123        #ZJC split line only one time on whitepace, grab both halves 
     124        ctx,path = re.split('\s+',l,1) 
    116125 
    117         # We have this file's context in the context file 
     126        if verbose: 
     127            print path 
     128        # Check to see that the path isn't one we're excluding 
    118129        if (clean_path == filename): 
    119130            update_ctx(filename, ctx) 
    …… 
    136147     
    137148    for l in lines: 
    138         # Grab the filename, context from the line 
    139         vals = re.split("\s", l) 
    140         ctx = vals[0]; path = vals[2] 
     149        #ZJC--continue to work with the previous input format 
     150        #or the new one generated by find 
     151         
     152        #ZJC Grab the filename, context from the line 
     153        #remove whitespace (eol markers, etc) from line start/end 
     154        l=l.strip() 
     155         
     156        #ZJC split line only one time on whitepace, grab both halves 
     157        ctx,path = re.split('\s+',l,1) 
    141158 
    142159        if verbose: 
    …… 
    170187        relabel(ctx_file, verbose) 
    171188    elif opts.has_key('-e'): 
    172         relabel_file(opts['-e'], ctx_file) 
     189        print "Individual file relabeling not implemented." 
     190        exit(-1) 
     191        #relabel_file(opts['-e'], ctx_file) 
    173192    elif opts.has_key('-h'): 
    174193        usage() 

  • trunk/RHEL4/selinux-usr/Makefile

    r1 r100  
    11SUBDIRS=libsepol libselinux libsemanage checkpolicy policycoreutils # policy 
    22PYSUBDIRS=libselinux libsemanage 
     3 
     4ifeq ($(uname -i), "x86_64") 
     5        export LIBPATH="lib64" 
     6else 
     7        export LIBPATH="lib" 
     8endif 
    39 
    410ifeq ($(DEBUG),1) 
    …… 
    814 
    915install relabel: 
     16        test -d $(DESTDIR)/BUILD || install -m 755 -d $(DESTDIR)/BUILD 
     17        test -d $(DESTDIR)/RPMS || install -m 755 -d $(DESTDIR)/RPMS 
     18        test -d $(DESTDIR)/RPMS/$(uname -i) || install -m 755 -d $(DESTDIR)/RPMS/$(uname -i) 
     19        test -d $(DESTDIR)/SOURCES || install -m 755 -d $(DESTDIR)/SOURCES 
     20        test -d $(DESTDIR)/SPECS || install -m 755 -d $(DESTDIR)/SPECS 
     21        test -d $(DESTDIR)/SRPMS || install -m 755 -d $(DESTDIR)/SRPMS 
    1022        @for subdir in $(SUBDIRS); do \ 
    1123                (cd $$subdir && $(MAKE) $@) || exit 1; \ 
    1224        done 
     25        ./mkrpm_sources.scp 
     26        ./mkrpm_builds.scp 
     27        echo "Upstream Files packaged..." > /home/jjarrett/package_status.txt 
    1328 
    1429install-pywrap: 

  • trunk/RHEL4/selinux-usr/checkpolicy/Makefile

    r1 r100  
    22# Makefile for building the checkpolicy program 
    33# 
    4 PREFIX ?= $(DESTDIR)/usr 
    5 BINDIR ?= $(PREFIX)/bin 
    6 MANDIR ?= $(PREFIX)/share/man 
    7 LIBDIR ?= $(PREFIX)/lib 
    8 INCLUDEDIR ?= $(PREFIX)/include 
     4PREFIX = $(DESTDIR)/usr 
     5BINDIR = $(PREFIX)/bin 
     6MANDIR = $(PREFIX)/share/man 
     7LIBDIR = $(PREFIX)/$(LIBPATH) 
     8INCLUDEDIR = $(PREFIX)/include 
    99TARGETS = checkpolicy checkmodule 
    1010 
    11 CFLAGS ?= -g -Wall -O2 -pipe -fno-strict-aliasing 
     11CFLAGS = -g -Wall -O2 -pipe -fno-strict-aliasing 
    1212 
    1313override CFLAGS += -I. -I${INCLUDEDIR} 

  • trunk/RHEL4/selinux-usr/checkpolicy/test/Makefile

    r1 r100  
    44PREFIX ?= $(DESTDIR)/usr 
    55BINDIR=$(PREFIX)/bin 
    6 LIBDIR=$(PREFIX)/lib 
     6LIBDIR=$(PREFIX)/$(LIBPATH) 
    77INCLUDEDIR ?= $(PREFIX)/include 
    88 

  • trunk/RHEL4/selinux-usr/libselinux/include/Makefile

    r1 r100  
    11# Installation directories. 
    2 PREFIX ?= $(DESTDIR)/usr 
    3 INCDIR ?= $(PREFIX)/include/selinux 
     2PREFIX = $(DESTDIR)/usr 
     3INCDIR = $(PREFIX)/include/selinux 
    44 
    55install: 

  • trunk/RHEL4/selinux-usr/libselinux/src/Makefile

    r1 r100  
    11# Installation directories. 
    2 PREFIX ?= $(DESTDIR)/usr 
    3 LIBDIR ?= $(PREFIX)/lib 
    4 SHLIBDIR ?= $(DESTDIR)/lib 
    5 INCLUDEDIR ?= $(PREFIX)/include 
     2PREFIX = $(DESTDIR)/usr 
     3LIBDIR = $(PREFIX)/$(LIBPATH) 
     4SHLIBDIR = $(DESTDIR)/$(LIBPATH) 
     5INCLUDEDIR = $(PREFIX)/include 
    66PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') 
    77PYINC ?= /usr/include/$(PYLIBVER) 

  • trunk/RHEL4/selinux-usr/libselinux/utils/Makefile

    r1 r100  
    11# Installation directories. 
    2 PREFIX ?= $(DESTDIR)/usr 
    3 LIBDIR ?= $(PREFIX)/lib 
    4 BINDIR ?= $(PREFIX)/sbin 
     2PREFIX = $(DESTDIR)/usr 
     3LIBDIR = $(PREFIX)/$(LIBPATH) 
     4BINDIR = $(PREFIX)/sbin 
    55 
    6 CFLAGS ?= -Wall 
     6CFLAGS = -Wall 
    77override CFLAGS += -I../include -D_GNU_SOURCE 
    88LDLIBS += -L../src -lselinux -lsepol -L$(LIBDIR) 

  • trunk/RHEL4/selinux-usr/libsemanage/include/Makefile

    r1 r100  
    11# Installation directories. 
    2 PREFIX ?= $(DESTDIR)/usr 
    3 INCDIR ?= $(PREFIX)/include/semanage 
     2PREFIX = $(DESTDIR)/usr 
     3INCDIR = $(PREFIX)/include/semanage 
    44 
    55install: 

  • trunk/RHEL4/selinux-usr/libsemanage/src/Makefile

    r1 r100  
    11# Installation directories. 
    2 PREFIX ?= $(DESTDIR)/usr 
    3 LIBDIR ?= $(PREFIX)/lib 
    4 SHLIBDIR ?= $(DESTDIR)/lib 
    5 INCLUDEDIR ?= $(PREFIX)/include 
     2PREFIX = $(DESTDIR)/usr 
     3LIBDIR = $(PREFIX)/$(LIBPATH) 
     4SHLIBDIR = $(DESTDIR)/$(LIBPATH) 
     5INCLUDEDIR = $(PREFIX)/include 
    66PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') 
    77PYINC ?= /usr/include/${PYLIBVER} 

  • trunk/RHEL4/selinux-usr/libsepol/include/Makefile

    r1 r100  
    11# Installation directories. 
    2 PREFIX ?= $(DESTDIR)/usr 
    3 INCDIR ?= $(PREFIX)/include/sepol 
     2PREFIX = $(DESTDIR)/usr 
     3INCDIR = $(PREFIX)/include/sepol 
    44 
    55install: 

  • trunk/RHEL4/selinux-usr/libsepol/src/Makefile

    r1 r100  
    11# Installation directories. 
    2 PREFIX ?= $(DESTDIR)/usr 
    3 LIBDIR ?= $(PREFIX)/lib 
    4 SHLIBDIR ?= $(DESTDIR)/lib 
     2PREFIX = $(DESTDIR)/usr 
     3LIBDIR = $(PREFIX)/$(LIBPATH) 
     4SHLIBDIR = $(DESTDIR)/$(LIBPATH) 
    55 
    66LIBVERSION = 1 

  • trunk/RHEL4/selinux-usr/libsepol/utils/Makefile

    r1 r100  
    11# Installation directories. 
    2 PREFIX ?= $(DESTDIR)/usr 
    3 BINDIR ?= $(PREFIX)/bin 
     2PREFIX = $(DESTDIR)/usr 
     3BINDIR = $(PREFIX)/bin 
    44 
    55CFLAGS ?= -Wall 

  • trunk/RHEL4/selinux-usr/mkrpm_sources.scp

    <
    r1 r100  
    11#!/bin/bash 
     2echo "Making RPMS sources" 
    23CHECKPOLVER=$(cat checkpolicy/VERSION) 
    34SELVER=$(cat libselinux/VERSION) 
    …… 
    1213mv policycoreutils policycoreutils-$PCUVER 
    1314mv selinux-doc selinux-doc-$DOCVER 
    14 tar czf rpm/SOURCES/checkpolicy-$CHECKPOLVER.tgz checkpolicy-$CHECKPOLVER 
    15 tar czf rpm/SOURCES/libselinux-$SELVER.tgz libselinux-$SELVER 
    16 tar czf rpm/SOURCES/libsemanage-$SEMVER.tgz libsemanage-$SEMVER 
    17 tar czf rpm/SOURCES/libsepol-$SEPVER.tgz libsepol-$SEPVER 
    18 tar czf rpm/SOURCES/policycoreutils-$PCUVER.tgz policycoreutils-$PCUVER 
    19 tar czf rpm/SOURCES/selinux-doc-$DOCVER.tgz selinux-doc-$DOCVER