diff --git a/base/linux26/linux-conf.in b/base/linux26/linux-conf.in index 228aeed5d..b8f771693 100644 --- a/base/linux26/linux-conf.in +++ b/base/linux26/linux-conf.in @@ -80,12 +80,12 @@ auto_config () yes '' | eval $MAKE $makeopt no2modconfig > /dev/null ; cp .config{,.2} if [ -f $base/target/$target/kernel$treever.conf.sh ] ; then - confscripts="$base/target/$target/kernel$treever.conf.sh $confscripts" + lx_confscripts="$base/target/$target/kernel$treever.conf.sh $confscripts" elif [ -f $base/target/$target/kernel.conf.sh ] ; then - confscripts="$base/target/$target/kernel.conf.sh $confscripts" + lx_confscripts="$base/target/$target/kernel.conf.sh $confscripts" fi - for x in $confscripts ; do + for x in $lx_confscripts ; do echo " running: $x" sh $x .config done diff --git a/network/l7-filter/patch_o_matic.in b/network/l7-filter/patch_o_matic.in index f8325fb07..4ac3a9da5 100644 --- a/network/l7-filter/patch_o_matic.in +++ b/network/l7-filter/patch_o_matic.in @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../l7-filter/patch_o_matic.in -# Copyright (C) 2006 - 2007 The OpenSDE Project +# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -27,7 +27,7 @@ if l7patch="`match_source_file netfilter l7-filter`"; then local patchfile # harmless for iptables - var_append confscripts ' ' $( echo $base/package/*/l7-filter/kernel.conf.sh ) + var_append lx_confscripts ' ' $( echo $base/package/*/l7-filter/kernel.conf.sh ) if [ "$pkg" = "iptables" ]; then patchfile=$( echo /tmp/${1%.tar*}/iptables-*.patch ) diff --git a/security/grsecurity/pkg_linux_pre.conf b/security/grsecurity/pkg_linux_pre.conf index a09ff57a9..03ce8bdfb 100644 --- a/security/grsecurity/pkg_linux_pre.conf +++ b/security/grsecurity/pkg_linux_pre.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../grsecurity/pkg_linux_pre.conf +# Filename: package/.../grsecurity/pkg_linux_pre.conf +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,7 +11,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- pkg_grsec_confdir=$base/package/*/grsecurity pkg_grsec_ver=`sed -n 's,^\[V\] \(.*\),\1,p' ${pkg_grsec_confdir}/grsecurity.desc` @@ -28,5 +29,5 @@ lx_extraversion="${lx_extraversion}-grsec" echo_status "Including grsecurity (grsecurity-$pkg_grsec_ver-$ver) patch..." var_append patchfiles ' ' "$pkg_grsec_tempdir/grsecurity-$pkg_grsec_ver-$ver.patch" -var_append confscripts ' ' "$pkg_grsec_confdir/kernel.conf.sh" +var_append lx_confscripts ' ' "$pkg_grsec_confdir/kernel.conf.sh" diff --git a/security/loop-aes/pkg_linux24_pre.conf b/security/loop-aes/pkg_linux24_pre.conf index 236a52b09..af6a84339 100644 --- a/security/loop-aes/pkg_linux24_pre.conf +++ b/security/loop-aes/pkg_linux24_pre.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../loop-aes/pkg_linux24_pre.conf +# Filename: package/.../loop-aes/pkg_linux24_pre.conf +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,7 +11,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- var_append lx_3rd_party_modules " " "loop-aes" @@ -23,4 +24,4 @@ laes_pp() } hook_add prepatch 5 "laes_pp" -var_append confscripts ' ' "$base/package/*/loop-aes/kernel.conf.sh" +var_append lx_confscripts ' ' "$base/package/*/loop-aes/kernel.conf.sh" diff --git a/security/loop-aes/pkg_linux26_pre.conf b/security/loop-aes/pkg_linux26_pre.conf index b795cc936..43964ece7 100644 --- a/security/loop-aes/pkg_linux26_pre.conf +++ b/security/loop-aes/pkg_linux26_pre.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../loop-aes/pkg_linux26_pre.conf +# Filename: package/.../loop-aes/pkg_linux26_pre.conf +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,7 +11,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- var_append lx_3rd_party_modules " " "loop-aes" @@ -24,4 +25,4 @@ laes_pp() } hook_add postpatch 5 "laes_pp" -var_append confscripts ' ' "$base/package/*/loop-aes/kernel.conf.sh" +var_append lx_confscripts ' ' "$base/package/*/loop-aes/kernel.conf.sh" diff --git a/security/loop-aes/pkg_linux26mm_pre.conf b/security/loop-aes/pkg_linux26mm_pre.conf index 4b8d84374..70961145b 100644 --- a/security/loop-aes/pkg_linux26mm_pre.conf +++ b/security/loop-aes/pkg_linux26mm_pre.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../loop-aes/pkg_linux26mm_pre.conf +# Filename: package/.../loop-aes/pkg_linux26mm_pre.conf +# Copyright (C) 2008 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,7 +11,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- var_append lx_3rd_party_modules " " "loop-aes" @@ -24,4 +25,4 @@ laes_pp() } hook_add postpatch 5 "laes_pp" -var_append confscripts ' ' "$base/package/*/loop-aes/kernel.conf.sh" +var_append lx_confscripts ' ' "$base/package/*/loop-aes/kernel.conf.sh" diff --git a/security/rsbac/pkg_linux_pre.conf b/security/rsbac/pkg_linux_pre.conf index 74b4e5069..373d5bd67 100644 --- a/security/rsbac/pkg_linux_pre.conf +++ b/security/rsbac/pkg_linux_pre.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../rsbac/pkg_linux_pre.conf -# Copyright (C) 2006 - 2007 The OpenSDE Project +# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -26,7 +26,7 @@ bunzip2 -c $pkg_rsbac_lxpatch > \ ${pkg_rsbac_tempdir}/rsbac-${pkg_rsbac_ver}.patch var_append patchfiles ' ' "${pkg_rsbac_tempdir}/rsbac-${pkg_rsbac_ver}.patch" -var_append confscripts ' ' "${pkg_rsbac_confdir}/kernel.conf.sh" +var_append lx_confscripts ' ' "${pkg_rsbac_confdir}/kernel.conf.sh" hook_add prepatch 4 "tar -v $taropt `match_source_file -p rsbac-common rsbac`" hook_add postpatch 6 "rm -rf $pkg_rsbac_tempdir" diff --git a/security/vserver/pkg_linux_pre.conf b/security/vserver/pkg_linux_pre.conf index 1ffced72a..851a36431 100644 --- a/security/vserver/pkg_linux_pre.conf +++ b/security/vserver/pkg_linux_pre.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../vserver/pkg_linux_pre.conf -# Copyright (C) 2006 - 2007 The OpenSDE Project +# Copyright (C) 2006 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -80,7 +80,7 @@ if [ "$SDECFG_PKG_VSERVER_QUOTA" = "1" ]; then echo_status "Including Per Context Quota/Disk Limits ($pkg_vquota_ver) support." var_append patchfiles ' ' $pkg_ctx_tempdir/vquota-$pkg_vquota_ver.patch - var_append confscripts ' ' $pkg_ctx_confdir/kernel-vquota.conf.sh + var_append lx_confscripts ' ' $pkg_ctx_confdir/kernel-vquota.conf.sh else echo_status "No Per Context Quota/Disk Limits support available for Linux ${pkg_ctx_lxver}" fi