diff --git a/lib/initcpio/install/arch_base b/lib/initcpio/install/arch_base index ac6f9a84b..dcb313bd8 100644 --- a/lib/initcpio/install/arch_base +++ b/lib/initcpio/install/arch_base @@ -75,6 +75,15 @@ install () add_file "/lib/libnss_dns.so.2" ### add copy-mountpoint.sh add_file "/usr/bin/copy-mountpoint.sh" + # fix licenses + add_file "/usr/share/licenses/bzip2/LICENSE" + add_file "/usr/share/licenses/hdparm/LICENSE.TXT" + add_file "/usr/share/licenses/ncurses/license.txt" + add_file "/usr/share/licenses/pcre/LICENSE" + add_file "/usr/share/licenses/shadow/LICENSE" + add_file "/usr/share/licenses/sdparm/COPYING" + add_file "/usr/share/licenses/vim/license.txt" + add_file "/usr/share/licenses/zlib/license.txt" } help () diff --git a/lib/initcpio/install/arch_base_lowmem b/lib/initcpio/install/arch_base_lowmem index 9b5fd03f2..67f00d7cb 100644 --- a/lib/initcpio/install/arch_base_lowmem +++ b/lib/initcpio/install/arch_base_lowmem @@ -60,6 +60,14 @@ install () add_file "/lib/libnss_dns.so.2" ### add copy-mountpoint.sh add_file "/usr/bin/copy-mountpoint.sh" + # fix licenses + add_file "/usr/share/licenses/bzip2/LICENSE" + add_file "/usr/share/licenses/hdparm/LICENSE.TXT" + add_file "/usr/share/licenses/ncurses/license.txt" + add_file "/usr/share/licenses/pcre/LICENSE" + add_file "/usr/share/licenses/shadow/LICENSE + add_file "/usr/share/licenses/sdparm/COPYING" + add_file "/usr/share/licenses/zlib/license.txt" } help () diff --git a/lib/initcpio/install/arch_encrypt b/lib/initcpio/install/arch_encrypt index 1a56756fb..5d1f8da81 100644 --- a/lib/initcpio/install/arch_encrypt +++ b/lib/initcpio/install/arch_encrypt @@ -7,6 +7,8 @@ install () FILES="" SCRIPT="arch_encrypt" add_dir "/dev/mapper" + # fix licenses + add_file "/usr/share/licenses/popt/COPYING" } help () diff --git a/lib/initcpio/install/arch_filesystems b/lib/initcpio/install/arch_filesystems index b22f5ed81..ef0067d3a 100644 --- a/lib/initcpio/install/arch_filesystems +++ b/lib/initcpio/install/arch_filesystems @@ -6,6 +6,9 @@ install () BINARIES="mkswap debugreiserfs mkreiserfs reiserfsck reiserfstune resize_reiserfs badblocks blkid debugfs dumpe2fs e2fsck e2image findfs fsck logsave mkfs.ext2 resize2fs mkntfs ntfsmount ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck dosfslabel ntfs-3g mount.nfs mount.cifs umount.cifs" FILES="" SCRIPT="arch_filesystems" + # fix licenses + add_file "/usr/share/licenses/e2fsprogs/BSD-LICENSE" + add_file "/usr/share/licenses/e2fsprogs/MIT-LICENSE" } help () diff --git a/lib/initcpio/install/arch_filesystems_lowmem b/lib/initcpio/install/arch_filesystems_lowmem index c81d852b2..e3dfacdb3 100644 --- a/lib/initcpio/install/arch_filesystems_lowmem +++ b/lib/initcpio/install/arch_filesystems_lowmem @@ -6,6 +6,9 @@ install () BINARIES="mkswap mkreiserfs mkfs.ext2 jfs_fsck jfs_mkfs mkfs.xfs xfs_freeze xfs_io mkdosfs blkid mkntfs ntfsmount ntfs-3g" FILES="" SCRIPT="arch_filesystems_lowmem" + # fix licenses + add_file "/usr/share/licenses/e2fsprogs/BSD-LICENSE" + add_file "/usr/share/licenses/e2fsprogs/MIT-LICENSE" } help () diff --git a/lib/initcpio/install/arch_lilo b/lib/initcpio/install/arch_lilo index 01ddf6c41..724fe56b6 100644 --- a/lib/initcpio/install/arch_lilo +++ b/lib/initcpio/install/arch_lilo @@ -7,6 +7,8 @@ install () FILES="" SCRIPT="" add_file "/usr/share/archboot/lilo/etc/lilo.conf" "/etc/lilo.conf" + # fix licenses + add_file "/usr/share/licenses/lilo/license.txt" } help () diff --git a/lib/initcpio/install/arch_net b/lib/initcpio/install/arch_net index 6f9f6821d..f0a3c2543 100644 --- a/lib/initcpio/install/arch_net +++ b/lib/initcpio/install/arch_net @@ -37,6 +37,16 @@ install () add_file "/sbin/dhclient-script" add_dir "/var/lib/dhclient" add_dir "/var/state/dhcp" + # fixing licenses + add_file "/usr/share/licenses/db/LICENSE" + add_file "/usr/share/licenses/dhcpcd/LICENSE" + add_file "/usr/share/licenses/dhclient/LICENSE" + add_file "/usr/share/licenses/dnsutils/LICENSE" + add_file "/usr/share/licenses/heimdal/LICENSE" + add_file "/usr/share/licenses/openssh/LICENSE" + add_file "/usr/share/licenses/openssl/LICENSE" + add_file "/usr/share/licenses/sqlite3/license.txt" + add_file "/usr/share/licenses/tcp_wrappers/license.txt" } help () diff --git a/lib/initcpio/install/arch_netcfg b/lib/initcpio/install/arch_netcfg index 857b05e6f..75cf780f7 100644 --- a/lib/initcpio/install/arch_netcfg +++ b/lib/initcpio/install/arch_netcfg @@ -21,6 +21,8 @@ install () add_file "/etc/rc.d/net-rename" add_file "/etc/rc.d/net-auto" add_file "/usr/share/archboot/netcfg/etc/iftab" "/etc/iftab" + # fix licenses + add_file "/usr/share/licenses/netcfg/LICENSE" } help () diff --git a/lib/initcpio/install/arch_openvpn b/lib/initcpio/install/arch_openvpn index 4faf4d858..f12cc15b5 100644 --- a/lib/initcpio/install/arch_openvpn +++ b/lib/initcpio/install/arch_openvpn @@ -8,8 +8,10 @@ install () SCRIPT="" CONFIG_FILES="README client.conf firewall.sh home.up loopback-client loopback-server office.up openvpn-shutdown.sh openvpn-startup.sh server.conf static-home.conf static-office.conf tls-home.conf tls-office.conf xinetd-client-config xinetd-server-config" for i in $CONFIG_FILES; do - add_file "/usr/share/archboot/openvpn/etc/openvpn/examples/$i" "/etc/openvpn/examples/$i" + add_file "/usr/share/archboot/openvpn/etc/openvpn/examples/$i" "/etc/openvpn/examples/$i" done + # fix licenses + add_file "/usr/share/licenses/openvpn/COPYING" } help () diff --git a/lib/initcpio/install/arch_ppp b/lib/initcpio/install/arch_ppp index 20d14ae5e..a5ab80241 100644 --- a/lib/initcpio/install/arch_ppp +++ b/lib/initcpio/install/arch_ppp @@ -16,6 +16,8 @@ install () add_file "/usr/share/archboot/ppp/etc/ppp/options" "/etc/ppp/options" add_file "/usr/share/archboot/ppp/etc/ppp/pap-secrets" "/etc/ppp/pap-secrets" add_file "/etc/rc.d/ppp" + # fix license files + add_file "/usr/share/licenses/libpcap/LICENSE" } help () diff --git a/lib/initcpio/install/arch_remote b/lib/initcpio/install/arch_remote index efbab11d5..e8cd2da31 100644 --- a/lib/initcpio/install/arch_remote +++ b/lib/initcpio/install/arch_remote @@ -4,7 +4,7 @@ install () { MODULES=" $(checked_modules "/drivers/net/") " - BINARIES="$(basename $(find /usr/bin/screen-*)) telnet tcpd findssl.sh scp sftp ssh ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd pmap_set pmap_dump portmap xinetd telnetd rsync exportfs nfsstat rpc.idmapd rpc.mountd rpc.nfsd rpc.statd rpcdebug showmount sm-notify start-statd" + BINARIES="$(basename $(find /usr/bin/screen-*)) tcpd findssl.sh scp sftp ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd pmap_set pmap_dump portmap xinetd telnetd rsync exportfs nfsstat rpc.idmapd rpc.mountd rpc.nfsd rpc.statd rpcdebug showmount sm-notify start-statd" FILES="" SCRIPT="arch_remote" add_file "/usr/share/archboot/remote/etc/hosts.allow" "/etc/hosts.allow" @@ -39,6 +39,11 @@ install () add_dir "/var/lib/nfs/sm" add_dir "/var/lib/nfs/sm.bak" add_dir "/var/lib/nfs/v4recovery" + # fix licenses + add_file "/usr/share/licenses/xinetd/COPYRIGHT" + add_file "/usr/share/licenses/libsasl/COPYING" + add_file "/usr/share/licenses/libldap/LICENSE" + add_file "/usr/share/licenses/nfsidmap/LICENSE" } help () diff --git a/lib/initcpio/install/arch_tz b/lib/initcpio/install/arch_tz index 3c853171c..3416b62a0 100644 --- a/lib/initcpio/install/arch_tz +++ b/lib/initcpio/install/arch_tz @@ -6,10 +6,12 @@ install () BINARIES="hwclock date ntpdate" FILES="" SCRIPT="" - for i in $(find /usr/share/zoneinfo ! -type d); do - add_file $i - done - add_file /usr/share/archboot/tz/tz /usr/bin/tz + for i in $(find /usr/share/zoneinfo ! -type d); do + add_file $i + done + add_file /usr/share/archboot/tz/tz /usr/bin/tz + # fix licenses + add_file "/usr/share/licenses/ntp/COPYRIGHT" } help () diff --git a/lib/initcpio/install/arch_wireless b/lib/initcpio/install/arch_wireless index 8bfc877ef..baa19be4b 100644 --- a/lib/initcpio/install/arch_wireless +++ b/lib/initcpio/install/arch_wireless @@ -63,6 +63,12 @@ install () add_file "/usr/share/archboot/wireless/etc/conf.d/wireless-regdom" "/etc/conf.d/wireless-regdom" add_file "/lib/udev/rules.d/85-regulatory.rules" add_file "/usr/lib/crda/regulatory.bin" + # fixing licenses + add_file "/usr/share/licenses/expat/COPYING" + add_file "/usr/share/licenses/dbus-core/COPYING" + add_file "/usr/share/licenses/crda/LICENSE" + add_file "/usr/share/licenses/wireless-regdb/LICENSE" + add_file "/usr/share/licenses/python/LICENSE" } help ()