opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build/base: finally weave obsolete files into build step 

Also signs the obsolete file list to complete the set signing.
This commit is contained in:
Franco Fichtner 2015-12-26 09:20:10 +01:00
parent 0eaa7c02bb
commit 1f05ee532a
7 changed files with 34062 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
build/base.sh
View File

@ -48,4 +48,35 @@ BASESET=${SETSDIR}/base-${REPO_VERSION}-${ARCH}
mv $(make -C${SRCDIR}/release -V .OBJDIR)/base.txz ${BASESET}.txz
echo -n "Generating obsolete file list... "
tar -tf ${BASESET}.txz | \
sed -e 's/^\.//g' -e '/\/$/d' | sort > /tmp/setdiff.new.${$}
: > /tmp/setdiff.old.${$}
if [ -s ${CONFIGDIR}/plist.base.${ARCH} ]; then
cat ${CONFIGDIR}/plist.base.${ARCH} | \
sed -e 's/^\.//g' -e '/\/$/d' | sort > /tmp/setdiff.old.${$}
fi
: > /tmp/setdiff.tmp.${$}
if [ -s ${CONFIGDIR}/plist.obsolete.${ARCH} ]; then
diff -u ${CONFIGDIR}/plist.obsolete.${ARCH} \
/tmp/setdiff.new.${$} | grep '^-/' | \
cut -b 2- > /tmp/setdiff.tmp.${$}
fi
(cat /tmp/setdiff.tmp.${$}; diff -u /tmp/setdiff.old.${$} \
/tmp/setdiff.new.${$} | grep '^-/' | cut -b 2-) | \
sort -u > ${BASESET}.obsolete
rm -f /tmp/setdiff.*
echo "done"
echo -n "Signing sets (if applicable)... "
generate_signature ${BASESET}.txz
generate_signature ${BASESET}.obsolete
echo "done"

2
build/clean.sh
View File

@ -50,6 +50,8 @@ for ARG in ${@}; do
echo ">>> Removing base set"
rm -f ${SETSDIR}/base-*-${ARCH}.txz
rm -f ${SETSDIR}/base-*-${ARCH}.txz.sig
rm -f ${SETSDIR}/base-*-${ARCH}.obsolete
rm -f ${SETSDIR}/base-*-${ARCH}.obsolete.sig
;;
packages)
echo ">>> Removing packages set"

16905
config/15.7/plist.base.amd64 Normal file
View File

File diff suppressed because it is too large Load Diff

16939
config/15.7/plist.base.i386 Normal file
View File

File diff suppressed because it is too large Load Diff

91
config/15.7/plist.obsolete.amd64 Normal file
View File

@ -0,0 +1,91 @@
/etc/gnats/freefall
/etc/rc.d/kerberos
/etc/rc.d/sshd
/etc/ssh/moduli
/etc/ssh/ssh_config
/etc/ssh/sshd_config
/usr/bin/otp-sha
/usr/bin/scp
/usr/bin/sendbug
/usr/bin/sftp
/usr/bin/slogin
/usr/bin/ssh
/usr/bin/ssh-add
/usr/bin/ssh-agent
/usr/bin/ssh-copy-id
/usr/bin/ssh-keygen
/usr/bin/ssh-keyscan
/usr/include/altq/altq_codel.h
/usr/include/altq/altq_fairq.h
/usr/include/clang/3.3/__wmmintrin_aes.h
/usr/include/clang/3.3/__wmmintrin_pclmul.h
/usr/include/clang/3.3/altivec.h
/usr/include/clang/3.3/ammintrin.h
/usr/include/clang/3.3/avx2intrin.h
/usr/include/clang/3.3/avxintrin.h
/usr/include/clang/3.3/bmi2intrin.h
/usr/include/clang/3.3/bmiintrin.h
/usr/include/clang/3.3/cpuid.h
/usr/include/clang/3.3/emmintrin.h
/usr/include/clang/3.3/f16cintrin.h
/usr/include/clang/3.3/fma4intrin.h
/usr/include/clang/3.3/fmaintrin.h
/usr/include/clang/3.3/immintrin.h
/usr/include/clang/3.3/lzcntintrin.h
/usr/include/clang/3.3/mm3dnow.h
/usr/include/clang/3.3/mm_malloc.h
/usr/include/clang/3.3/mmintrin.h
/usr/include/clang/3.3/module.map
/usr/include/clang/3.3/nmmintrin.h
/usr/include/clang/3.3/pmmintrin.h
/usr/include/clang/3.3/popcntintrin.h
/usr/include/clang/3.3/prfchwintrin.h
/usr/include/clang/3.3/rdseedintrin.h
/usr/include/clang/3.3/rtmintrin.h
/usr/include/clang/3.3/smmintrin.h
/usr/include/clang/3.3/tmmintrin.h
/usr/include/clang/3.3/wmmintrin.h
/usr/include/clang/3.3/x86intrin.h
/usr/include/clang/3.3/xmmintrin.h
/usr/include/clang/3.3/xopintrin.h
/usr/include/net/pf_mtag.h
/usr/lib/pam_ssh.so
/usr/lib/pam_ssh.so.5
/usr/lib/private/libssh.a
/usr/lib/private/libssh.so
/usr/lib/private/libssh.so.5
/usr/libexec/bsdconfig/070.usermgmt/groupinput
/usr/libexec/bsdconfig/070.usermgmt/userinput
/usr/libexec/sftp-server
/usr/libexec/ssh-keysign
/usr/libexec/ssh-pkcs11-helper
/usr/sbin/sshd
/usr/share/examples/bsdconfig/browse_packages_ftp.sh
/usr/share/info/send-pr.info.gz
/usr/share/man/man1/dtc.1.gz
/usr/share/man/man1/otp-sha.1.gz
/usr/share/man/man1/scp.1.gz
/usr/share/man/man1/send-pr.1.gz
/usr/share/man/man1/sendbug.1.gz
/usr/share/man/man1/sftp.1.gz
/usr/share/man/man1/slogin.1.gz
/usr/share/man/man1/ssh-add.1.gz
/usr/share/man/man1/ssh-agent.1.gz
/usr/share/man/man1/ssh-copy-id.1.gz
/usr/share/man/man1/ssh-keygen.1.gz
/usr/share/man/man1/ssh-keyscan.1.gz
/usr/share/man/man1/ssh.1.gz
/usr/share/man/man5/ssh_config.5.gz
/usr/share/man/man5/sshd_config.5.gz
/usr/share/man/man8/pam_ssh.8.gz
/usr/share/man/man8/sftp-server.8.gz
/usr/share/man/man8/ssh-keysign.8.gz
/usr/share/man/man8/ssh-pkcs11-helper.8.gz
/usr/share/man/man8/sshd.8.gz
/usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
/usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
/usr/share/man/man9/VOP_GETVOBJECT.9.gz
/usr/share/man/man9/pmap_change_wiring.9.gz
/usr/share/mk/bsd.dtrace.mk
/usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
/usr/share/zoneinfo/America/Montreal

94
config/15.7/plist.obsolete.i386 Normal file
View File

@ -0,0 +1,94 @@
/boot/loader.old
/boot/zfsloader.old
/etc/gnats/freefall
/etc/rc.d/kerberos
/etc/rc.d/sshd
/etc/ssh/moduli
/etc/ssh/ssh_config
/etc/ssh/sshd_config
/sbin/init.bak
/usr/bin/otp-sha
/usr/bin/scp
/usr/bin/sendbug
/usr/bin/sftp
/usr/bin/slogin
/usr/bin/ssh
/usr/bin/ssh-add
/usr/bin/ssh-agent
/usr/bin/ssh-copy-id
/usr/bin/ssh-keygen
/usr/bin/ssh-keyscan
/usr/include/altq/altq_codel.h
/usr/include/altq/altq_fairq.h
/usr/include/clang/3.3/__wmmintrin_aes.h
/usr/include/clang/3.3/__wmmintrin_pclmul.h
/usr/include/clang/3.3/altivec.h
/usr/include/clang/3.3/ammintrin.h
/usr/include/clang/3.3/avx2intrin.h
/usr/include/clang/3.3/avxintrin.h
/usr/include/clang/3.3/bmi2intrin.h
/usr/include/clang/3.3/bmiintrin.h
/usr/include/clang/3.3/cpuid.h
/usr/include/clang/3.3/emmintrin.h
/usr/include/clang/3.3/f16cintrin.h
/usr/include/clang/3.3/fma4intrin.h
/usr/include/clang/3.3/fmaintrin.h
/usr/include/clang/3.3/immintrin.h
/usr/include/clang/3.3/lzcntintrin.h
/usr/include/clang/3.3/mm3dnow.h
/usr/include/clang/3.3/mm_malloc.h
/usr/include/clang/3.3/mmintrin.h
/usr/include/clang/3.3/module.map
/usr/include/clang/3.3/nmmintrin.h
/usr/include/clang/3.3/pmmintrin.h
/usr/include/clang/3.3/popcntintrin.h
/usr/include/clang/3.3/prfchwintrin.h
/usr/include/clang/3.3/rdseedintrin.h
/usr/include/clang/3.3/rtmintrin.h
/usr/include/clang/3.3/smmintrin.h
/usr/include/clang/3.3/tmmintrin.h
/usr/include/clang/3.3/wmmintrin.h
/usr/include/clang/3.3/x86intrin.h
/usr/include/clang/3.3/xmmintrin.h
/usr/include/clang/3.3/xopintrin.h
/usr/include/net/pf_mtag.h
/usr/lib/pam_ssh.so
/usr/lib/pam_ssh.so.5
/usr/lib/private/libssh.a
/usr/lib/private/libssh.so
/usr/lib/private/libssh.so.5
/usr/libexec/bsdconfig/070.usermgmt/groupinput
/usr/libexec/bsdconfig/070.usermgmt/userinput
/usr/libexec/sftp-server
/usr/libexec/ssh-keysign
/usr/libexec/ssh-pkcs11-helper
/usr/sbin/sshd
/usr/share/examples/bsdconfig/browse_packages_ftp.sh
/usr/share/info/send-pr.info.gz
/usr/share/man/man1/dtc.1.gz
/usr/share/man/man1/otp-sha.1.gz
/usr/share/man/man1/scp.1.gz
/usr/share/man/man1/send-pr.1.gz
/usr/share/man/man1/sendbug.1.gz
/usr/share/man/man1/sftp.1.gz
/usr/share/man/man1/slogin.1.gz
/usr/share/man/man1/ssh-add.1.gz
/usr/share/man/man1/ssh-agent.1.gz
/usr/share/man/man1/ssh-copy-id.1.gz
/usr/share/man/man1/ssh-keygen.1.gz
/usr/share/man/man1/ssh-keyscan.1.gz
/usr/share/man/man1/ssh.1.gz
/usr/share/man/man5/ssh_config.5.gz
/usr/share/man/man5/sshd_config.5.gz
/usr/share/man/man8/pam_ssh.8.gz
/usr/share/man/man8/sftp-server.8.gz
/usr/share/man/man8/ssh-keysign.8.gz
/usr/share/man/man8/ssh-pkcs11-helper.8.gz
/usr/share/man/man8/sshd.8.gz
/usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
/usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
/usr/share/man/man9/VOP_GETVOBJECT.9.gz
/usr/share/man/man9/pmap_change_wiring.9.gz
/usr/share/mk/bsd.dtrace.mk
/usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
/usr/share/zoneinfo/America/Montreal

48
scripts/obsolete_files.sh
View File

@ -1,48 +0,0 @@
#!/bin/sh
# Copyright (c) 2015 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
set -e
if [ ${#} -lt 2 ]; then
echo "Usage: ${0} old.txz new.txz [old.obsolete]"
exit 1
fi
tar -tf ${1} | sed -e 's/^\.//g' -e '/\/$/d' | sort > /tmp/setdiff.old.${$}
tar -tf ${2} | sed -e 's/^\.//g' -e '/\/$/d' | sort > /tmp/setdiff.new.${$}
: > /tmp/setdiff.tmp.${$}
if [ -n "${3}" ]; then
# reinstated files need to be removed from old.obsolete
diff -u ${3} /tmp/setdiff.new.${$} | grep '^-/' | \
cut -b 2- > /tmp/setdiff.tmp.${$}
fi
(cat /tmp/setdiff.tmp.${$}; diff -u /tmp/setdiff.old.${$} \
/tmp/setdiff.new.${$} | grep '^-/' | cut -b 2-) | sort -u
rm -f /tmp/setdiff.*