IPFire-SCM January 2011

ipfire-scm@lists.ipfire.org

1 participants
93 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 109a1ec7d488dbb36c236f9d9cd0629764c52e17
by git＠ipfire.org 31 Jan '11

31 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 109a1ec7d488dbb36c236f9d9cd0629764c52e17 (commit) via 58d2aa5582cdf2c6f99071178be09fd2cee1ff73 (commit) via c7bfbdc2ef1c29d357c5d0def038637b8c9c7387 (commit) from beb726d82b7705190288b26a743665b50bba99ea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 109a1ec7d488dbb36c236f9d9cd0629764c52e17 Merge: 58d2aa5 beb726d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 23:09:22 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit 58d2aa5582cdf2c6f99071178be09fd2cee1ff73 Merge: 24c0b6a c7bfbdc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 23:09:04 2011 +0100 Merge branch 'core45' ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/update.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 64be6d3..228ada4 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -48,6 +48,10 @@ extract_files sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp fcrontab /var/tmp/root.tmp +# Disable snort packet decoding alerts +sed -i "s|#config disable_decode_alerts|config disable_decode_alerts|g" /etc/snort/snort.conf +sed -i "s|#config disable_tcpopt_alerts|config disable_tcpopt_alerts|g" /etc/snort/snort.conf + # #Start services echo Starting Proxy hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. beb726d82b7705190288b26a743665b50bba99ea
by git＠ipfire.org 31 Jan '11

31 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via beb726d82b7705190288b26a743665b50bba99ea (commit) from 0324cdbd19f1b09b66390823029e11993d40b140 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit beb726d82b7705190288b26a743665b50bba99ea Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 1 00:03:45 2011 +0100 Updated nmap (5.50). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/nmap | 137 +++++++++++++++++++++++++++++++++++++-- lfs/nmap | 8 +- 2 files changed, 134 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap index 70ba74f..ab15654 100644 --- a/config/rootfiles/packages/nmap +++ b/config/rootfiles/packages/nmap @@ -1,6 +1,7 @@ usr/bin/ncat usr/bin/ndiff usr/bin/nmap +usr/bin/nping #usr/share/man/de/man1/nmap.1 #usr/share/man/es/man1/nmap.1 #usr/share/man/fr/man1/nmap.1 @@ -17,6 +18,7 @@ usr/bin/nmap #usr/share/man/man1/ncat.1 #usr/share/man/man1/ndiff.1 #usr/share/man/man1/nmap.1 +#usr/share/man/man1/nping.1 #usr/share/man/pl #usr/share/man/pl/man1 #usr/share/man/pl/man1/nmap.1 @@ -43,6 +45,7 @@ usr/share/ncat/ca-bundle.crt #usr/share/nmap usr/share/nmap/nmap-mac-prefixes usr/share/nmap/nmap-os-db +usr/share/nmap/nmap-payloads usr/share/nmap/nmap-protocols usr/share/nmap/nmap-rpc usr/share/nmap/nmap-service-probes @@ -51,16 +54,20 @@ usr/share/nmap/nmap.dtd usr/share/nmap/nmap.xsl usr/share/nmap/nse_main.lua #usr/share/nmap/nselib +usr/share/nmap/nselib/afp.lua +usr/share/nmap/nselib/asn1.lua usr/share/nmap/nselib/base64.lua +usr/share/nmap/nselib/brute.lua usr/share/nmap/nselib/citrixxml.lua usr/share/nmap/nselib/comm.lua #usr/share/nmap/nselib/data usr/share/nmap/nselib/data/favicon-db -usr/share/nmap/nselib/data/folders.lst -usr/share/nmap/nselib/data/http-fingerprints +usr/share/nmap/nselib/data/http-fingerprints.lua +usr/share/nmap/nselib/data/http-folders.txt usr/share/nmap/nselib/data/oracle-sids usr/share/nmap/nselib/data/passwords.lst #usr/share/nmap/nselib/data/psexec +usr/share/nmap/nselib/data/psexec/README usr/share/nmap/nselib/data/psexec/backdoor.lua usr/share/nmap/nselib/data/psexec/default.lua usr/share/nmap/nselib/data/psexec/drives.lua @@ -68,26 +75,40 @@ usr/share/nmap/nselib/data/psexec/examples.lua usr/share/nmap/nselib/data/psexec/experimental.lua usr/share/nmap/nselib/data/psexec/network.lua usr/share/nmap/nselib/data/psexec/nmap_service.c -usr/share/nmap/nselib/data/psexec/nmap_service.exe usr/share/nmap/nselib/data/psexec/nmap_service.vcproj usr/share/nmap/nselib/data/psexec/pwdump.lua usr/share/nmap/nselib/data/usernames.lst -usr/share/nmap/nselib/data/yokoso-fingerprints usr/share/nmap/nselib/datafiles.lua +usr/share/nmap/nselib/dhcp.lua usr/share/nmap/nselib/dns.lua +usr/share/nmap/nselib/dnssd.lua +usr/share/nmap/nselib/drda.lua +usr/share/nmap/nselib/ftp.lua +usr/share/nmap/nselib/giop.lua usr/share/nmap/nselib/http.lua usr/share/nmap/nselib/imap.lua +usr/share/nmap/nselib/informix.lua usr/share/nmap/nselib/ipOps.lua +usr/share/nmap/nselib/iscsi.lua +usr/share/nmap/nselib/json.lua +usr/share/nmap/nselib/ldap.lua usr/share/nmap/nselib/listop.lua usr/share/nmap/nselib/match.lua +usr/share/nmap/nselib/mongodb.lua usr/share/nmap/nselib/msrpc.lua usr/share/nmap/nselib/msrpcperformance.lua usr/share/nmap/nselib/msrpctypes.lua +usr/share/nmap/nselib/mssql.lua +usr/share/nmap/nselib/mysql.lua usr/share/nmap/nselib/netbios.lua +usr/share/nmap/nselib/nrpc.lua usr/share/nmap/nselib/nsedebug.lua usr/share/nmap/nselib/packet.lua +usr/share/nmap/nselib/pgsql.lua usr/share/nmap/nselib/pop3.lua usr/share/nmap/nselib/proxy.lua +usr/share/nmap/nselib/rmi.lua +usr/share/nmap/nselib/rpc.lua usr/share/nmap/nselib/shortport.lua usr/share/nmap/nselib/smb.lua usr/share/nmap/nselib/smbauth.lua @@ -98,57 +119,141 @@ usr/share/nmap/nselib/stdnse.lua usr/share/nmap/nselib/strbuf.lua usr/share/nmap/nselib/strict.lua usr/share/nmap/nselib/tab.lua +usr/share/nmap/nselib/target.lua +usr/share/nmap/nselib/tns.lua usr/share/nmap/nselib/unpwdb.lua +usr/share/nmap/nselib/upnp.lua usr/share/nmap/nselib/url.lua +usr/share/nmap/nselib/vnc.lua +usr/share/nmap/nselib/wsdd.lua #usr/share/nmap/scripts +usr/share/nmap/scripts/afp-brute.nse +usr/share/nmap/scripts/afp-path-vuln.nse +usr/share/nmap/scripts/afp-serverinfo.nse +usr/share/nmap/scripts/afp-showmount.nse usr/share/nmap/scripts/asn-query.nse usr/share/nmap/scripts/auth-owners.nse usr/share/nmap/scripts/auth-spoof.nse usr/share/nmap/scripts/banner.nse +usr/share/nmap/scripts/broadcast-dns-service-discovery.nse +usr/share/nmap/scripts/broadcast-dropbox-listener.nse +usr/share/nmap/scripts/broadcast-ms-sql-discover.nse +usr/share/nmap/scripts/broadcast-upnp-info.nse +usr/share/nmap/scripts/broadcast-wsdd-discover.nse usr/share/nmap/scripts/citrix-brute-xml.nse usr/share/nmap/scripts/citrix-enum-apps-xml.nse usr/share/nmap/scripts/citrix-enum-apps.nse usr/share/nmap/scripts/citrix-enum-servers-xml.nse usr/share/nmap/scripts/citrix-enum-servers.nse +usr/share/nmap/scripts/couchdb-databases.nse +usr/share/nmap/scripts/couchdb-stats.nse +usr/share/nmap/scripts/daap-get-library.nse usr/share/nmap/scripts/daytime.nse -usr/share/nmap/scripts/db2-info.nse +usr/share/nmap/scripts/db2-das-info.nse +usr/share/nmap/scripts/db2-discover.nse usr/share/nmap/scripts/dhcp-discover.nse +usr/share/nmap/scripts/dns-cache-snoop.nse +usr/share/nmap/scripts/dns-fuzz.nse usr/share/nmap/scripts/dns-random-srcport.nse usr/share/nmap/scripts/dns-random-txid.nse usr/share/nmap/scripts/dns-recursion.nse +usr/share/nmap/scripts/dns-service-discovery.nse +usr/share/nmap/scripts/dns-update.nse usr/share/nmap/scripts/dns-zone-transfer.nse +usr/share/nmap/scripts/domcon-brute.nse +usr/share/nmap/scripts/domcon-cmd.nse +usr/share/nmap/scripts/domino-enum-users.nse +usr/share/nmap/scripts/drda-brute.nse +usr/share/nmap/scripts/drda-info.nse usr/share/nmap/scripts/finger.nse +usr/share/nmap/scripts/firewalk.nse usr/share/nmap/scripts/ftp-anon.nse usr/share/nmap/scripts/ftp-bounce.nse usr/share/nmap/scripts/ftp-brute.nse -usr/share/nmap/scripts/html-title.nse +usr/share/nmap/scripts/ftp-libopie.nse +usr/share/nmap/scripts/ftp-proftpd-backdoor.nse +usr/share/nmap/scripts/giop-info.nse +usr/share/nmap/scripts/gopher-ls.nse +usr/share/nmap/scripts/hddtemp-info.nse +usr/share/nmap/scripts/hostmap.nse usr/share/nmap/scripts/http-auth.nse +usr/share/nmap/scripts/http-brute.nse usr/share/nmap/scripts/http-date.nse +usr/share/nmap/scripts/http-domino-enum-passwords.nse usr/share/nmap/scripts/http-enum.nse usr/share/nmap/scripts/http-favicon.nse +usr/share/nmap/scripts/http-form-brute.nse usr/share/nmap/scripts/http-headers.nse usr/share/nmap/scripts/http-iis-webdav-vuln.nse usr/share/nmap/scripts/http-malware-host.nse +usr/share/nmap/scripts/http-methods.nse usr/share/nmap/scripts/http-open-proxy.nse usr/share/nmap/scripts/http-passwd.nse +usr/share/nmap/scripts/http-php-version.nse +usr/share/nmap/scripts/http-robots.txt.nse +usr/share/nmap/scripts/http-title.nse usr/share/nmap/scripts/http-trace.nse usr/share/nmap/scripts/http-userdir-enum.nse +usr/share/nmap/scripts/http-vhosts.nse +usr/share/nmap/scripts/http-vmware-path-vuln.nse usr/share/nmap/scripts/iax2-version.nse usr/share/nmap/scripts/imap-capabilities.nse +usr/share/nmap/scripts/informix-brute.nse +usr/share/nmap/scripts/informix-query.nse +usr/share/nmap/scripts/informix-tables.nse +usr/share/nmap/scripts/ipidseq.nse usr/share/nmap/scripts/irc-info.nse +usr/share/nmap/scripts/irc-unrealircd-backdoor.nse +usr/share/nmap/scripts/iscsi-brute.nse +usr/share/nmap/scripts/iscsi-info.nse +usr/share/nmap/scripts/jdwp-version.nse +usr/share/nmap/scripts/ldap-brute.nse +usr/share/nmap/scripts/ldap-rootdse.nse +usr/share/nmap/scripts/ldap-search.nse +usr/share/nmap/scripts/lexmark-config.nse +usr/share/nmap/scripts/modbus-discover.nse +usr/share/nmap/scripts/mongodb-databases.nse +usr/share/nmap/scripts/mongodb-info.nse +usr/share/nmap/scripts/ms-sql-brute.nse +usr/share/nmap/scripts/ms-sql-config.nse +usr/share/nmap/scripts/ms-sql-empty-password.nse +usr/share/nmap/scripts/ms-sql-hasdbaccess.nse usr/share/nmap/scripts/ms-sql-info.nse +usr/share/nmap/scripts/ms-sql-query.nse +usr/share/nmap/scripts/ms-sql-tables.nse +usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse +usr/share/nmap/scripts/mysql-brute.nse +usr/share/nmap/scripts/mysql-databases.nse +usr/share/nmap/scripts/mysql-empty-password.nse usr/share/nmap/scripts/mysql-info.nse +usr/share/nmap/scripts/mysql-users.nse +usr/share/nmap/scripts/mysql-variables.nse +usr/share/nmap/scripts/nat-pmp-info.nse usr/share/nmap/scripts/nbstat.nse +usr/share/nmap/scripts/netbus-auth-bypass.nse +usr/share/nmap/scripts/netbus-brute.nse +usr/share/nmap/scripts/netbus-info.nse +usr/share/nmap/scripts/netbus-version.nse +usr/share/nmap/scripts/nfs-ls.nse usr/share/nmap/scripts/nfs-showmount.nse +usr/share/nmap/scripts/nfs-statfs.nse +usr/share/nmap/scripts/nrpe-enum.nse usr/share/nmap/scripts/ntp-info.nse +usr/share/nmap/scripts/ntp-monlist.nse +usr/share/nmap/scripts/oracle-brute.nse +usr/share/nmap/scripts/oracle-enum-users.nse usr/share/nmap/scripts/oracle-sid-brute.nse usr/share/nmap/scripts/p2p-conficker.nse +usr/share/nmap/scripts/path-mtu.nse +usr/share/nmap/scripts/pgsql-brute.nse usr/share/nmap/scripts/pjl-ready-message.nse usr/share/nmap/scripts/pop3-brute.nse usr/share/nmap/scripts/pop3-capabilities.nse usr/share/nmap/scripts/pptp-version.nse +usr/share/nmap/scripts/qscan.nse usr/share/nmap/scripts/realvnc-auth-bypass.nse -usr/share/nmap/scripts/robots.txt.nse +usr/share/nmap/scripts/resolveall.nse +usr/share/nmap/scripts/rmi-dumpregistry.nse usr/share/nmap/scripts/rpcinfo.nse usr/share/nmap/scripts/script.db usr/share/nmap/scripts/skypev2-version.nse @@ -160,6 +265,7 @@ usr/share/nmap/scripts/smb-enum-processes.nse usr/share/nmap/scripts/smb-enum-sessions.nse usr/share/nmap/scripts/smb-enum-shares.nse usr/share/nmap/scripts/smb-enum-users.nse +usr/share/nmap/scripts/smb-flood.nse usr/share/nmap/scripts/smb-os-discovery.nse usr/share/nmap/scripts/smb-psexec.nse usr/share/nmap/scripts/smb-security-mode.nse @@ -167,18 +273,35 @@ usr/share/nmap/scripts/smb-server-stats.nse usr/share/nmap/scripts/smb-system-info.nse usr/share/nmap/scripts/smbv2-enabled.nse usr/share/nmap/scripts/smtp-commands.nse +usr/share/nmap/scripts/smtp-enum-users.nse usr/share/nmap/scripts/smtp-open-relay.nse usr/share/nmap/scripts/smtp-strangeport.nse usr/share/nmap/scripts/sniffer-detect.nse usr/share/nmap/scripts/snmp-brute.nse +usr/share/nmap/scripts/snmp-interfaces.nse +usr/share/nmap/scripts/snmp-netstat.nse +usr/share/nmap/scripts/snmp-processes.nse usr/share/nmap/scripts/snmp-sysdescr.nse +usr/share/nmap/scripts/snmp-win32-services.nse +usr/share/nmap/scripts/snmp-win32-shares.nse +usr/share/nmap/scripts/snmp-win32-software.nse +usr/share/nmap/scripts/snmp-win32-users.nse usr/share/nmap/scripts/socks-open-proxy.nse usr/share/nmap/scripts/sql-injection.nse usr/share/nmap/scripts/ssh-hostkey.nse +usr/share/nmap/scripts/ssh2-enum-algos.nse usr/share/nmap/scripts/sshv1.nse usr/share/nmap/scripts/ssl-cert.nse +usr/share/nmap/scripts/ssl-enum-ciphers.nse usr/share/nmap/scripts/sslv2.nse +usr/share/nmap/scripts/stuxnet-detect.nse +usr/share/nmap/scripts/svn-brute.nse +usr/share/nmap/scripts/targets-traceroute.nse usr/share/nmap/scripts/telnet-brute.nse usr/share/nmap/scripts/upnp-info.nse +usr/share/nmap/scripts/vnc-brute.nse +usr/share/nmap/scripts/vnc-info.nse +usr/share/nmap/scripts/wdb-version.nse usr/share/nmap/scripts/whois.nse +usr/share/nmap/scripts/wsdd-discover.nse usr/share/nmap/scripts/x11-access.nse diff --git a/lfs/nmap b/lfs/nmap index c39bb05..f746b21 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 5.20 +VER = 5.50 THISAPP = nmap-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nmap -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 07e74592beaea0b5946a6cf06f9157de +$(DL_FILE)_MD5 = a4df96e52cb52a1bbe76caace5f21388 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0324cdbd19f1b09b66390823029e11993d40b140
by git＠ipfire.org 31 Jan '11

31 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 0324cdbd19f1b09b66390823029e11993d40b140 (commit) via 72c5e364546485fa8db29197605d4be89d57918c (commit) from 24c0b6af6cb65f35068159f1d9bef42f8f7eb5c0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0324cdbd19f1b09b66390823029e11993d40b140 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 20:58:14 2011 +0100 Updated cacti (0.8.7g). commit 72c5e364546485fa8db29197605d4be89d57918c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 20:53:55 2011 +0100 Started core46. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/24 => core/46}/exclude | 0 config/rootfiles/core/46/filelists/files | 1 + config/rootfiles/core/{44 => 46}/meta | 0 config/rootfiles/{oldcore/42 => core/46}/update.sh | 8 ++++++-- config/rootfiles/packages/cacti | 9 ++++++--- lfs/cacti | 7 ++++--- make.sh | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/24 => core/46}/exclude (100%) create mode 100644 config/rootfiles/core/46/filelists/files copy config/rootfiles/core/{44 => 46}/meta (100%) copy config/rootfiles/{oldcore/42 => core/46}/update.sh (88%) Difference in files: diff --git a/config/rootfiles/core/46/exclude b/config/rootfiles/core/46/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/46/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/46/meta b/config/rootfiles/core/46/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/46/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/46/update.sh b/config/rootfiles/core/46/update.sh new file mode 100644 index 0000000..5e84319 --- /dev/null +++ b/config/rootfiles/core/46/update.sh @@ -0,0 +1,52 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove core updates from pakfire cache to save space... +rm -f /var/cache/pakfire/core-upgrade-*.ipfire +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti index 1935c5a..123d1f6 100644 --- a/config/rootfiles/packages/cacti +++ b/config/rootfiles/packages/cacti @@ -16,6 +16,7 @@ usr/share/cacti/cli/add_graph_template.php usr/share/cacti/cli/add_graphs.php usr/share/cacti/cli/add_perms.php usr/share/cacti/cli/add_tree.php +usr/share/cacti/cli/convert_innodb.php usr/share/cacti/cli/copy_user.php usr/share/cacti/cli/host_update_template.php usr/share/cacti/cli/import_template.php @@ -25,6 +26,7 @@ usr/share/cacti/cli/poller_output_empty.php usr/share/cacti/cli/poller_reindex_hosts.php usr/share/cacti/cli/rebuild_poller_cache.php usr/share/cacti/cli/repair_database.php +usr/share/cacti/cli/repair_templates.php usr/share/cacti/cli/structure_rra_paths.php usr/share/cacti/cli/upgrade_database.php usr/share/cacti/cmd.php @@ -311,6 +313,8 @@ usr/share/cacti/install/0_8_7a_to_0_8_7b.php usr/share/cacti/install/0_8_7b_to_0_8_7c.php usr/share/cacti/install/0_8_7c_to_0_8_7d.php usr/share/cacti/install/0_8_7d_to_0_8_7e.php +usr/share/cacti/install/0_8_7e_to_0_8_7f.php +usr/share/cacti/install/0_8_7f_to_0_8_7g.php usr/share/cacti/install/0_8_to_0_8_1.php usr/share/cacti/install/index.php usr/share/cacti/install/install_finish.gif @@ -495,8 +499,7 @@ usr/share/cacti/utilities.php #var/cacti #var/cacti/log var/cacti/log/.htaccess -var/cacti/log/.placeholder -var/cacti/log/cacti.log +#var/cacti/log/cacti.log #var/cacti/rra -var/cacti/rra/.placeholder +var/cacti/rra/.htaccess var/ipfire/backup/addons/includes/cacti diff --git a/lfs/cacti b/lfs/cacti index 9862cfe..ef06ead 100644 --- a/lfs/cacti +++ b/lfs/cacti @@ -24,7 +24,7 @@ include Config -VER = 0.8.7e +VER = 0.8.7g THISAPP = cacti-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cacti -PAK_VER = 2 +PAK_VER = 3 DEPS = "netsnmpd mysql" @@ -44,7 +44,8 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7563a58a57d2c6cc0da28cc341a30969 +$(DL_FILE)_MD5 = 268421cb1a58d3444f7ecbddb4c4b016 + install : $(TARGET) diff --git a/make.sh b/make.sh index f144ec4..b9a5078 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="45" # Core Level (Filename) +CORE="46" # Core Level (Filename) PAKFIRE_CORE="45" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core45, updated. c7bfbdc2ef1c29d357c5d0def038637b8c9c7387
by git＠ipfire.org 31 Jan '11

31 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core45 has been updated via c7bfbdc2ef1c29d357c5d0def038637b8c9c7387 (commit) from ce97b3f3fc7616690aa7d405013f9ae62b7f04d4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c7bfbdc2ef1c29d357c5d0def038637b8c9c7387 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 31 19:10:49 2011 +0100 core45: disable snort packet decode alerts also on update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/45/update.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 64be6d3..228ada4 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -48,6 +48,10 @@ extract_files sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp fcrontab /var/tmp/root.tmp +# Disable snort packet decoding alerts +sed -i "s|#config disable_decode_alerts|config disable_decode_alerts|g" /etc/snort/snort.conf +sed -i "s|#config disable_tcpopt_alerts|config disable_tcpopt_alerts|g" /etc/snort/snort.conf + # #Start services echo Starting Proxy hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 24c0b6af6cb65f35068159f1d9bef42f8f7eb5c0
by git＠ipfire.org 29 Jan '11

29 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 24c0b6af6cb65f35068159f1d9bef42f8f7eb5c0 (commit) via ce97b3f3fc7616690aa7d405013f9ae62b7f04d4 (commit) via 051cb353c6497ee22222a876e09472e048d20115 (commit) via 49ec908e2d359656e154184b85024546d82767c2 (commit) from f89463d829e35e0d6b0b6894acaa0c80a35f3c0b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 24c0b6af6cb65f35068159f1d9bef42f8f7eb5c0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 29 20:37:23 2011 +0100 ipfireseeder: update to seed core45. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 6 +++--- src/paks/linux-xen/install.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 56480db..4939004 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core44.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core45.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 8e75257..4fea43d 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core44.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core45.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 20 +PAK_VER = 21 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 70365fee7ca86b2e059eda81ed804b49 +$(DL_FILE)_MD5 = 3e68353572b67ba3837e15134b124a22 install : $(TARGET) diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 80234d0..2015b5d 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -51,7 +51,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf # Add new Entry to grub.conf # echo "" >> /boot/grub/grub.conf -echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf +echo "title IPFire (XEN-Kernel $KVER)" >> /boot/grub/grub.conf echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf echo " initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf echo "# savedefault $ENTRY" >> /boot/grub/grub.conf hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b2d97716ff7f2444fc8249ac249d0557135821e1
by git＠ipfire.org 26 Jan '11

26 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via b2d97716ff7f2444fc8249ac249d0557135821e1 (commit) via 8e7a32baa5ede1929a4817011b265dcef452a1bf (commit) via bd523de6726a07060e1a852192e8f579602a33c1 (commit) from c5d1d6b94a4543244d8183bc391af2c378a79102 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b2d97716ff7f2444fc8249ac249d0557135821e1 Merge: 8e7a32b c5d1d6b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 26 23:30:31 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 8e7a32baa5ede1929a4817011b265dcef452a1bf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 26 23:29:45 2011 +0100 naoki: Enable packaging of attrs. Does not work properly at the moment. commit bd523de6726a07060e1a852192e8f579602a33c1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 26 23:29:28 2011 +0100 tar: Update to 1.25. ----------------------------------------------------------------------- Summary of changes: .../tar/patches/tar-1.14-loneZeroWarning.patch | 28 ++ ...runcate.patch => tar-1.15.1-vfatTruncate.patch} | 0 pkgs/core/tar/patches/tar-1.17-wildcards.patch | 85 +++++ pkgs/core/tar/patches/tar-1.22-atime-rofs.patch | 13 + pkgs/core/tar/patches/tar-1.23-oldarchive.patch | 14 + ...tar-1.23-xattrs.patch => tar-1.24-xattrs.patch} | 321 +++++++++++--------- .../tar/patches/tar-1.25-listedincremental.patch | 219 +++++++++++++ pkgs/core/tar/patches/tar-1.25-sparse-names.patch | 126 ++++++++ pkgs/core/tar/patches/tar-sigpipe.patch | 12 + pkgs/core/tar/tar.nm | 14 +- tools/packager | 2 +- 11 files changed, 687 insertions(+), 147 deletions(-) create mode 100644 pkgs/core/tar/patches/tar-1.14-loneZeroWarning.patch rename pkgs/core/tar/patches/{tar-1.22-vfatTruncate.patch => tar-1.15.1-vfatTruncate.patch} (100%) create mode 100644 pkgs/core/tar/patches/tar-1.17-wildcards.patch create mode 100644 pkgs/core/tar/patches/tar-1.22-atime-rofs.patch create mode 100644 pkgs/core/tar/patches/tar-1.23-oldarchive.patch rename pkgs/core/tar/patches/{tar-1.23-xattrs.patch => tar-1.24-xattrs.patch} (84%) create mode 100644 pkgs/core/tar/patches/tar-1.25-listedincremental.patch create mode 100644 pkgs/core/tar/patches/tar-1.25-sparse-names.patch create mode 100644 pkgs/core/tar/patches/tar-sigpipe.patch Difference in files: diff --git a/pkgs/core/tar/patches/tar-1.14-loneZeroWarning.patch b/pkgs/core/tar/patches/tar-1.14-loneZeroWarning.patch new file mode 100644 index 0000000..cefa83d --- /dev/null +++ b/pkgs/core/tar/patches/tar-1.14-loneZeroWarning.patch @@ -0,0 +1,28 @@ +diff -ruNp tar-1.22.orig/src/list.c tar-1.22/src/list.c +--- tar-1.22.orig/src/list.c 2008-10-30 12:10:04.000000000 +0100 ++++ tar-1.22/src/list.c 2009-03-06 00:03:05.925105425 +0100 +@@ -138,6 +138,14 @@ read_and (void (*do_something) (void)) + + if (!ignore_zeros_option) + { ++ /* ++ * According to POSIX tar specs, this is wrong, but on the web ++ * there are some tar specs that can trigger this, and some tar ++ * implementations create tars according to that spec. For now, ++ * let's not be pedantic about issuing the warning. ++ */ ++#if 0 ++ + char buf[UINTMAX_STRSIZE_BOUND]; + + status = read_header (&current_header, &current_stat_info, +@@ -147,6 +155,9 @@ read_and (void (*do_something) (void)) + WARNOPT (WARN_ALONE_ZERO_BLOCK, + (0, 0, _("A lone zero block at %s"), + STRINGIFY_BIGINT (current_block_ordinal (), buf))); ++#endif ++ status = read_header (&current_header, &current_stat_info, ++ read_header_auto); + break; + } + status = prev_status; diff --git a/pkgs/core/tar/patches/tar-1.15.1-vfatTruncate.patch b/pkgs/core/tar/patches/tar-1.15.1-vfatTruncate.patch new file mode 100644 index 0000000..bcbb88e --- /dev/null +++ b/pkgs/core/tar/patches/tar-1.15.1-vfatTruncate.patch @@ -0,0 +1,29 @@ +--- tar-1.15.1/src/system.c.vfatTruncate 2004-09-06 07:31:00.000000000 -0400 ++++ tar-1.15.1/src/system.c 2006-02-03 14:40:51.000000000 -0500 +@@ -272,8 +272,25 @@ + int + sys_truncate (int fd) + { ++ struct stat st; + off_t pos = lseek (fd, (off_t) 0, SEEK_CUR); +- return pos < 0 ? -1 : ftruncate (fd, pos); ++ ++ if ( pos < 0) ++ return -1; ++ ++ if ( ftruncate(fd, pos) && errno == EPERM ) { ++ /* wrapper around ftruncate: ++ * ftruncate may fail to grow the size of a file with some OS and filesystem ++ * combinations. Linux and vfat/fat is one example. If this is the case do ++ * a write to grow the file to the desired length. ++ */ ++ if( (fstat( fd, &st ) == -1) || ++ (st.st_size >= pos) || ++ (lseek( fd, pos - 1, SEEK_SET) == (off_t)-1) || ++ (write( fd, "\0", 1) == -1) ) ++ return -1; ++ } ++ return 0; + } + + /* Return nonzero if NAME is the name of a regular file, or if the file diff --git a/pkgs/core/tar/patches/tar-1.17-wildcards.patch b/pkgs/core/tar/patches/tar-1.17-wildcards.patch new file mode 100644 index 0000000..0ea5269 --- /dev/null +++ b/pkgs/core/tar/patches/tar-1.17-wildcards.patch @@ -0,0 +1,85 @@ +--- tar-1.17/doc/tar.texi.wildcards 2007-06-28 13:23:46.000000000 +0200 ++++ tar-1.17/doc/tar.texi 2007-06-28 13:23:46.000000000 +0200 +@@ -6871,7 +6871,7 @@ The following table summarizes pattern-m + + @multitable @columnfractions .3 .7 + @headitem Members @tab Default settings +-@item Inclusion @tab @option{--no-wildcards --anchored --no-wildcards-match-slash} ++@item Inclusion @tab @option{--wildcards --anchored --wildcards-match-slash} + @item Exclusion @tab @option{--wildcards --no-anchored --wildcards-match-slash} + @end multitable + +@@ -10666,6 +10666,9 @@ version of this document is available at + @table @asis + @item Use of globbing patterns when listing and extracting. + ++Note: Following is true for original unpatched GNU tar. ++For compatibility reasons, the old behavior was preserved. ++ + Previous versions of GNU tar assumed shell-style globbing when + extracting from or listing an archive. For example: + +--- tar-1.17/src/tar.c.wildcards 2007-06-28 13:23:46.000000000 +0200 ++++ tar-1.17/src/tar.c 2007-06-28 13:23:46.000000000 +0200 +@@ -686,7 +686,7 @@ static struct argp_option options[] = { + {"no-ignore-case", NO_IGNORE_CASE_OPTION, 0, 0, + N_("case sensitive matching (default)"), GRID+1 }, + {"wildcards", WILDCARDS_OPTION, 0, 0, +- N_("use wildcards (default for exclusion)"), GRID+1 }, ++ N_("use wildcards (default)"), GRID+1 }, + {"no-wildcards", NO_WILDCARDS_OPTION, 0, 0, + N_("verbatim string matching"), GRID+1 }, + {"no-wildcards-match-slash", NO_WILDCARDS_MATCH_SLASH_OPTION, 0, 0, +@@ -780,8 +780,7 @@ ARGMATCH_VERIFY (atime_preserve_args, at + /* Wildcard matching settings */ + enum wildcards + { +- default_wildcards, /* For exclusion == enable_wildcards, +- for inclusion == disable_wildcards */ ++ default_wildcards, /* enable_wildcards */ + disable_wildcards, + enable_wildcards + }; +@@ -809,7 +808,7 @@ struct tar_args /* Variables used + | recursion_option) + + #define MAKE_INCL_OPTIONS(args) \ +- ((((args)->wildcards == enable_wildcards) ? EXCLUDE_WILDCARDS : 0) \ ++ ((((args)->wildcards != disable_wildcards) ? EXCLUDE_WILDCARDS : 0) \ + | (args)->include_anchored \ + | (args)->matching_flags \ + | recursion_option) +@@ -2126,7 +2125,7 @@ decode_options (int argc, char **argv) + + /* Warn about implicit use of the wildcards in command line arguments. + See TODO */ +- warn_regex_usage = args.wildcards == default_wildcards; ++ warn_regex_usage = 0; /* args.wildcards == default_wildcards; */ + + /* Derive option values and check option consistency. */ + +--- tar-1.17/src/names.c.wildcards 2007-04-03 14:17:13.000000000 +0200 ++++ tar-1.17/src/names.c 2007-06-28 13:30:48.000000000 +0200 +@@ -812,10 +812,7 @@ collect_and_sort_names (void) + + if (name->found_count || name->directory) + continue; +- if (name->matching_flags & EXCLUDE_WILDCARDS) +- /* NOTE: EXCLUDE_ANCHORED is not relevant here */ +- /* FIXME: just skip regexps for now */ +- continue; ++ + chdir_do (name->change_dir); + + if (name->name[0] == 0) +diff -urNp tar-1.23-orig/tests/exclude01.at tar-1.23/tests/exclude01.at +--- tar-1.23-orig/tests/exclude01.at 2010-01-26 12:30:20.000000000 +0100 ++++ tar-1.23/tests/exclude01.at 2010-03-12 14:42:31.000000000 +0100 +@@ -59,6 +59,7 @@ testdir/dir2/file2 + testdir/dir3/ + NEXT + testdir/dir1/* ++testdir/dir1/file1 + NEXT + testdir/dir1/* + NEXT diff --git a/pkgs/core/tar/patches/tar-1.22-atime-rofs.patch b/pkgs/core/tar/patches/tar-1.22-atime-rofs.patch new file mode 100644 index 0000000..c9f3b08 --- /dev/null +++ b/pkgs/core/tar/patches/tar-1.22-atime-rofs.patch @@ -0,0 +1,13 @@ +diff -urNp tar-1.22-orig/src/create.c tar-1.22/src/create.c +--- tar-1.22-orig/src/create.c 2009-05-15 10:50:38.000000000 +0200 ++++ tar-1.22/src/create.c 2009-05-15 10:51:52.000000000 +0200 +@@ -1691,7 +1691,8 @@ dump_file0 (struct tar_stat_info *st, co + set_exit_status (TAREXIT_DIFFERS); + } + else if (atime_preserve_option == replace_atime_preserve +- && set_file_atime (fd, parentfd, name, st->atime) != 0) ++ && set_file_atime (fd, parentfd, name, st->atime) != 0 ++ && errno != EROFS ) + utime_error (p); + } + diff --git a/pkgs/core/tar/patches/tar-1.22-vfatTruncate.patch b/pkgs/core/tar/patches/tar-1.22-vfatTruncate.patch deleted file mode 100644 index bcbb88e..0000000 --- a/pkgs/core/tar/patches/tar-1.22-vfatTruncate.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- tar-1.15.1/src/system.c.vfatTruncate 2004-09-06 07:31:00.000000000 -0400 -+++ tar-1.15.1/src/system.c 2006-02-03 14:40:51.000000000 -0500 -@@ -272,8 +272,25 @@ - int - sys_truncate (int fd) - { -+ struct stat st; - off_t pos = lseek (fd, (off_t) 0, SEEK_CUR); -- return pos < 0 ? -1 : ftruncate (fd, pos); -+ -+ if ( pos < 0) -+ return -1; -+ -+ if ( ftruncate(fd, pos) && errno == EPERM ) { -+ /* wrapper around ftruncate: -+ * ftruncate may fail to grow the size of a file with some OS and filesystem -+ * combinations. Linux and vfat/fat is one example. If this is the case do -+ * a write to grow the file to the desired length. -+ */ -+ if( (fstat( fd, &st ) == -1) || -+ (st.st_size >= pos) || -+ (lseek( fd, pos - 1, SEEK_SET) == (off_t)-1) || -+ (write( fd, "\0", 1) == -1) ) -+ return -1; -+ } -+ return 0; - } - - /* Return nonzero if NAME is the name of a regular file, or if the file diff --git a/pkgs/core/tar/patches/tar-1.23-oldarchive.patch b/pkgs/core/tar/patches/tar-1.23-oldarchive.patch new file mode 100644 index 0000000..6163916 --- /dev/null +++ b/pkgs/core/tar/patches/tar-1.23-oldarchive.patch @@ -0,0 +1,14 @@ +diff -urNp tar-1.23-orig/src/tar.c tar-1.23/src/tar.c +--- tar-1.23-orig/src/tar.c 2010-06-01 13:55:03.792173060 +0200 ++++ tar-1.23/src/tar.c 2010-06-01 14:01:40.494172986 +0200 +@@ -1911,6 +1911,10 @@ parse_opt (int key, char *arg, struct ar + _("Invalid number"))); + } + break; ++ ++ case OLD_ARCHIVE_OPTION: ++ set_archive_format ("v7"); ++ break; + + case OVERWRITE_DIR_OPTION: + old_files_option = DEFAULT_OLD_FILES; diff --git a/pkgs/core/tar/patches/tar-1.23-xattrs.patch b/pkgs/core/tar/patches/tar-1.23-xattrs.patch deleted file mode 100644 index b829652..0000000 --- a/pkgs/core/tar/patches/tar-1.23-xattrs.patch +++ /dev/null @@ -1,1574 +0,0 @@ -diff -urNp tar-1.23-orig/configure.ac tar-1.23/configure.ac ---- tar-1.23-orig/configure.ac 2010-03-10 11:47:54.000000000 +0100 -+++ tar-1.23/configure.ac 2010-03-12 13:48:43.000000000 +0100 -@@ -44,7 +44,7 @@ AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h - sys/param.h sys/device.h sys/filio.h sys/gentape.h \ - sys/inet.h sys/io/trioctl.h \ - sys/mtio.h sys/time.h sys/tprintf.h sys/tape.h \ -- unistd.h locale.h) -+ unistd.h locale.h attr/xattr.h sys/acl.h) - - AC_CHECK_HEADERS([sys/buf.h], [], [], - [#if HAVE_SYS_PARAM_H -@@ -91,6 +91,12 @@ gl_INIT - tar_PAXUTILS - - AC_CHECK_FUNCS(fsync getdtablesize lstat mkfifo readlink symlink setlocale utimes) -+AC_CHECK_FUNCS(getxattr fgetxattr lgetxattr \ -+ setxattr fsetxattr lsetxattr \ -+ listxattr flistxattr llistxattr, -+ AC_DEFINE(HAVE_XATTRS,,[Define if we have a working extended attributes]),) -+AC_CHECK_LIB(acl, acl_get_fd) -+ - AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>]) - AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>]) - AC_CHECK_DECLS([time],,, [#include <time.h>]) -@@ -214,6 +220,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_QUOTING_STYLE - # Iconv - AM_ICONV - AC_CHECK_HEADERS(iconv.h) -+AC_CHECK_HEADERS(attr/xattr.h) - AC_CHECK_TYPE(iconv_t,:, - AC_DEFINE(iconv_t, int, - [Conversion descriptor type]), -@@ -223,6 +230,17 @@ AC_CHECK_TYPE(iconv_t,:, - #endif - ]) - -+AC_ARG_ENABLE(selinux, -+ AC_HELP_STRING([--enable-selinux], -+ [enable SELinux support (disabled by default)]), -+ [selinux_enabled=$enableval], -+ [selinux_enabled=no]) -+ -+if test "x$selinux_enabled" = xyes; then -+ AC_CHECK_LIB(selinux, getfilecon) -+ AC_CHECK_HEADERS(selinux/selinux.h) -+fi -+ - # Gettext. - AM_GNU_GETTEXT([external], [need-formatstring-macros]) - AM_GNU_GETTEXT_VERSION([0.16]) -diff -urNp tar-1.23-orig/doc/tar.texi tar-1.23/doc/tar.texi ---- tar-1.23-orig/doc/tar.texi 2010-03-09 15:24:24.000000000 +0100 -+++ tar-1.23/doc/tar.texi 2010-03-12 13:48:43.000000000 +0100 -@@ -2364,6 +2364,10 @@ Normally when creating an archive, @comm - @samp{/} from member names. This option disables that behavior. - @xref{absolute}. - -+@opsummary{acl} -+@item --acls -+Causes @command{tar} to store ACL's. @xref{Attributes}. -+ - @opsummary{after-date} - @item --after-date - -@@ -2885,6 +2889,10 @@ contents have changed (as opposed to jus - also back up files for which any status information has - changed). @xref{after}. - -+@opsummary{no-acl} -+@item --no-acls -+Causes @command{tar} not to store and not to extract ACL's. @xref{Attributes}. -+ - @opsummary{no-anchored} - @item --no-anchored - An exclude pattern can match any subsequence of the name's components. -@@ -2968,11 +2976,21 @@ locations. Usually @command{tar} determ - the archive can be seeked or not. Use this option to disable this - mechanism. - -+@opsummary{no-selinux} -+@item --no-selinux -+Causes @command{tar} not to store and not to extract SELinux security context. -+@xref{Attributes}. -+ - @opsummary{no-unquote} - @item --no-unquote - Treat all input file or member names literally, do not interpret - escape sequences. @xref{input name quoting}. - -+@opsummary{no-xattrs} -+@item --no-xattrs -+Causes @command{tar} not to store and not to extract xattrs. This option also -+enables @option{--no-selinux} and @option{--no-acls}. @xref{Attributes}. -+ - @opsummary{no-wildcards} - @item --no-wildcards - Do not use wildcards. -@@ -3202,6 +3220,11 @@ in cases when such recognition fails. I - archive is open for reading (e.g. with @option{--list} or - @option{--extract} options). - -+@opsummary{selinux} -+@item --selinux -+Causes @command{tar} to store SElinux security context. @xref{Attributes}. -+ -+ - @opsummary{show-defaults} - @item --show-defaults - -@@ -3411,6 +3434,11 @@ Enable or disable warning messages ident - messages are suppressed if @var{keyword} is prefixed with @samp{no-}. - @xref{warnings}. - -+@opsummary{xattrs} -+@item --xattrs -+Causes @command{tar} to store xattrs. This option also enables -+@option{--selinux} and @option{--acls}. @xref{Attributes}. -+ - @opsummary{wildcards} - @item --wildcards - Use wildcards when matching member names with patterns. -@@ -8599,6 +8627,8 @@ implementation able to read @samp{ustar} - most @samp{posix} archives as well, with the only exception that any - additional information (such as long file names etc.) will in such - case be extracted as plain text files along with the files it refers to. -+This is the only format that can store ACLs, SELinux context and extended -+attributes. - - This archive format will be the default format for future versions - of @GNUTAR{}. -@@ -9160,6 +9190,51 @@ Same as both @option{--same-permissions} - - This option is deprecated, and will be removed in @GNUTAR{} version 1.23. - -+@opindex acls -+@item --acls -+This option causes @command{tar} to store the current ACL in the archive. -+ -+The @option{--acls} option has no equivalent short option name. -+ -+@opindex selinux -+@item --selinux -+This option causes @command{tar} to store the current SELinux security context -+information in the archive. -+ -+The @option{--selinux} option has no equivalent short option name. -+ -+@opindex xattrs -+@item --xattrs -+This option causes @command{tar} to store the current extended attributes in -+the archive. This option also enables @option{--acls} and @option{--selinux} if -+they haven't been set already. -+ -+The @option{--xattrs} option has no equivalent short option name. -+ -+@opindex no-acls -+@item --no-acls -+This option causes @command{tar} not to store the current ACL in the archive -+and not to extract any ACL information in an archive. -+ -+The @option{--no-acls} option has no equivalent short option name. -+ -+@opindex no-selinux -+@item --no-selinux -+This option causes @command{tar} not to store the current SELinux security -+context information in the archive and not to extract any SELinux information in -+an archive. -+ -+The @option{--no-selinux} option has no equivalent short option name. -+ -+@opindex no-xattrs -+@item --no-xattrs -+This option causes @command{tar} not to store the current extended attributes in -+the archive and not to extract any extended attributes in an archive. This -+option also enables @option{--no-acls} and @option{--no-selinux} if -+they haven't been set already. -+ -+The @option{--no-xattrs} option has no equivalent short option name. -+ - @end table - - @node Portability -diff -urNp tar-1.23-orig/src/common.h tar-1.23/src/common.h ---- tar-1.23-orig/src/common.h 2010-01-26 13:21:18.000000000 +0100 -+++ tar-1.23/src/common.h 2010-03-12 13:48:43.000000000 +0100 -@@ -251,6 +251,15 @@ GLOBAL int same_owner_option; - /* If positive, preserve permissions when extracting. */ - GLOBAL int same_permissions_option; - -+/* If positive, save the SELinux context. */ -+GLOBAL int selinux_context_option; -+ -+/* If positive, save the ACLs. */ -+GLOBAL int acls_option; -+ -+/* If positive, save the user and root xattrs. */ -+GLOBAL int xattrs_option; -+ - /* When set, strip the given number of file name components from the file name - before extracting */ - GLOBAL size_t strip_name_components; -@@ -732,6 +741,9 @@ extern char *output_start; - - void update_archive (void); - -+/* Module attrs.c. */ -+#include "xattrs.h" -+ - /* Module xheader.c. */ - - void xheader_init (struct xheader *xhdr); -@@ -753,6 +765,12 @@ bool xheader_string_end (struct xheader - bool xheader_keyword_deleted_p (const char *kw); - char *xheader_format_name (struct tar_stat_info *st, const char *fmt, - size_t n); -+void xheader_xattr_init(struct tar_stat_info *st); -+void xheader_xattr_free(struct xattr_array *vals, size_t sz); -+void xheader_xattr_copy(const struct tar_stat_info *st, -+ struct xattr_array **vals, size_t *sz); -+void xheader_xattr_add(struct tar_stat_info *st, -+ const char *key, const char *val, size_t len); - - /* Module system.c */ - -diff -urNp tar-1.23-orig/src/create.c tar-1.23/src/create.c ---- tar-1.23-orig/src/create.c 2010-03-09 13:52:41.000000000 +0100 -+++ tar-1.23/src/create.c 2010-03-12 13:48:43.000000000 +0100 -@@ -24,6 +24,7 @@ - #include <quotearg.h> - - #include "common.h" -+ - #include <hash.h> - - struct link -@@ -947,6 +948,30 @@ start_header (struct tar_stat_info *st) - GNAME_TO_CHARS (st->gname, header->header.gname); - } - -+ if (archive_format == POSIX_FORMAT) -+ { -+ if (acls_option > 0) -+ { -+ if (st->acls_a_ptr) -+ xheader_store ("SCHILY.acl.access", st, NULL); -+ if (st->acls_d_ptr) -+ xheader_store ("SCHILY.acl.default", st, NULL); -+ } -+ if ((selinux_context_option > 0) && st->cntx_name) -+ xheader_store ("RHT.security.selinux", st, NULL); -+ if (xattrs_option > 0) -+ { -+ size_t scan_xattr = 0; -+ struct xattr_array *xattr_map = st->xattr_map; -+ -+ while (scan_xattr < st->xattr_map_size) -+ { -+ xheader_store (xattr_map[scan_xattr].xkey, st, &scan_xattr); -+ ++scan_xattr; -+ } -+ } -+ } -+ - return header; - } - -@@ -1580,6 +1605,10 @@ dump_file0 (struct tar_stat_info *st, co - } - } - -+ xattrs_acls_get(st, p, fd, !is_dir); -+ xattrs_selinux_get(st, p, fd); -+ xattrs_xattrs_get(st, p, fd); -+ - if (is_dir) - { - const char *tag_file_name; -@@ -1702,6 +1731,9 @@ dump_file0 (struct tar_stat_info *st, co - if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) < size) - write_long_link (st); - -+ xattrs_selinux_get(st, p, -1); -+ xattrs_xattrs_get(st, p, -1); -+ - block_ordinal = current_block_ordinal (); - st->stat.st_size = 0; /* force 0 size on symlink */ - header = start_header (st); -diff -urNp tar-1.23-orig/src/extract.c tar-1.23/src/extract.c ---- tar-1.23-orig/src/extract.c 2010-01-26 12:28:09.000000000 +0100 -+++ tar-1.23/src/extract.c 2010-03-12 13:48:43.000000000 +0100 -@@ -70,6 +70,13 @@ struct delayed_set_stat - mode_t invert_permissions; - enum permstatus permstatus; - bool after_links; -+ char *cntx_name; -+ char *acls_a_ptr; -+ size_t acls_a_len; -+ char *acls_d_ptr; -+ size_t acls_d_len; -+ size_t xattr_map_size; /* Size of the xattr map */ -+ struct xattr_array *xattr_map; - char file_name[1]; - }; - -@@ -97,6 +104,18 @@ struct delayed_link - hard-linked together. */ - struct string_list *sources; - -+ /* SELinux context */ -+ char *cntx_name; -+ -+ /* ACLs */ -+ char *acls_a_ptr; -+ size_t acls_a_len; -+ char *acls_d_ptr; -+ size_t acls_d_len; -+ -+ size_t xattr_map_size; /* Size of the xattr map */ -+ struct xattr_array *xattr_map; -+ - /* The desired target of the desired link. */ - char target[1]; - }; -@@ -290,6 +309,10 @@ set_stat (char const *file_name, - give files away. */ - } - -+ xattrs_acls_set(st, file_name, typeflag); -+ xattrs_selinux_set(st, file_name, typeflag); -+ xattrs_xattrs_set(st, file_name, typeflag); -+ - if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS) - { - /* When lchown exists, it should be used to change the attributes of -@@ -366,6 +389,29 @@ delay_set_stat (char const *file_name, s - data->invert_permissions = invert_permissions; - data->permstatus = permstatus; - data->after_links = 0; -+ data->cntx_name = NULL; -+ assign_string (&data->cntx_name, st->cntx_name); -+ if (st->acls_a_ptr) -+ { -+ data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1); -+ data->acls_a_len = st->acls_a_len; -+ } -+ else -+ { -+ data->acls_a_ptr = NULL; -+ data->acls_a_len = 0; -+ } -+ if (st->acls_d_ptr) -+ { -+ data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1); -+ data->acls_d_len = st->acls_d_len; -+ } -+ else -+ { -+ data->acls_d_ptr = NULL; -+ data->acls_d_len = 0; -+ } -+ xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size); - strcpy (data->file_name, file_name); - delayed_set_stat_head = data; - } -@@ -571,6 +617,31 @@ maybe_recoverable (char *file_name, int - } - } - -+/* Restore stat extended attributes (xattr) for FILE_NAME, using information -+ given in *ST. Restore before extraction because they may affect layout. -+ If not restoring permissions, invert the -+ INVERT_PERMISSIONS bits from the file's current permissions. -+ TYPEFLAG specifies the type of the file. -+ FILE_CREATED indicates set_xattr has created the file */ -+static int -+set_xattr (char const *file_name, struct tar_stat_info const *st, -+ mode_t invert_permissions, char typeflag, int *file_created) -+{ -+ int status = 0; -+ int interdir_made = 0; -+ -+ if ((xattrs_option >= 0) && st->xattr_map_size) { -+ mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask; -+ -+ do -+ status = mknod (file_name, mode ^ invert_permissions, 0); -+ while (status && maybe_recoverable ((char *)file_name, &interdir_made)); -+ xattrs_xattrs_set(st, file_name, typeflag); -+ *file_created = 1; -+ } -+ return(status); -+} -+ - /* Fix the statuses of all directories whose statuses need fixing, and - which are not ancestors of FILE_NAME. If AFTER_LINKS is - nonzero, do this for all such directories; otherwise, stop at the -@@ -624,11 +695,22 @@ apply_nonancestor_delayed_set_stat (char - sb.stat.st_gid = data->gid; - sb.atime = data->atime; - sb.mtime = data->mtime; -+ sb.cntx_name = data->cntx_name; -+ sb.acls_a_ptr = data->acls_a_ptr; -+ sb.acls_a_len = data->acls_a_len; -+ sb.acls_d_ptr = data->acls_d_ptr; -+ sb.acls_d_len = data->acls_d_len; -+ sb.xattr_map = data->xattr_map; -+ sb.xattr_map_size = data->xattr_map_size; - set_stat (data->file_name, &sb, cur_info, - data->invert_permissions, data->permstatus, DIRTYPE); - } - - delayed_set_stat_head = data->next; -+ xheader_xattr_free (data->xattr_map, data->xattr_map_size); -+ free (data->cntx_name); -+ free (data->acls_a_ptr); -+ free (data->acls_d_ptr); - free (data); - } - } -@@ -730,7 +812,7 @@ extract_dir (char *file_name, int typefl - - - static int --open_output_file (char *file_name, int typeflag, mode_t mode) -+open_output_file (char *file_name, int typeflag, mode_t mode, int file_created) - { - int fd; - int openflag = (O_WRONLY | O_BINARY | O_CREAT -@@ -738,6 +820,10 @@ open_output_file (char *file_name, int t - ? O_TRUNC - : O_EXCL)); - -+ /* File might be created in set_xattr. So clear O_EXCL to avoid open() failure */ -+ if (file_created) -+ openflag = openflag & ~O_EXCL; -+ - #if O_CTG - /* Contiguous files (on the Masscomp) have to specify the size in - the open call that creates them. */ -@@ -796,8 +882,18 @@ extract_file (char *file_name, int typef - else - { - int recover = RECOVER_NO; -+ int file_created = 0; -+ if (set_xattr (file_name, &current_stat_info, invert_permissions, -+ typeflag, &file_created)) -+ { -+ skip_member (); -+ open_error (file_name); -+ return 1; -+ } -+ - do -- fd = open_output_file (file_name, typeflag, mode ^ invert_permissions); -+ fd = open_output_file (file_name, typeflag, mode ^ invert_permissions, -+ file_created); - while (fd < 0 - && (recover = maybe_recoverable (file_name, &interdir_made)) - == RECOVER_OK); -@@ -922,6 +1018,13 @@ create_placeholder_file (char *file_name - + strlen (file_name) + 1); - p->sources->next = 0; - strcpy (p->sources->string, file_name); -+ p->cntx_name = NULL; -+ assign_string (&p->cntx_name, current_stat_info.cntx_name); -+ p->acls_a_ptr = NULL; -+ p->acls_a_len = 0; -+ p->acls_d_ptr = NULL; -+ p->acls_d_len = 0; -+ xheader_xattr_copy (&current_stat_info, &p->xattr_map, &p->xattr_map_size); - strcpy (p->target, current_stat_info.link_name); - - h = delayed_set_stat_head; -@@ -1335,6 +1438,13 @@ apply_delayed_links (void) - struct tar_stat_info st1; - st1.stat.st_uid = ds->uid; - st1.stat.st_gid = ds->gid; -+ st1.cntx_name = ds->cntx_name; -+ st1.acls_a_ptr = ds->acls_a_ptr; -+ st1.acls_a_len = ds->acls_a_len; -+ st1.acls_d_ptr = ds->acls_d_ptr; -+ st1.acls_d_len = ds->acls_d_len; -+ st1.xattr_map = ds->xattr_map; -+ st1.xattr_map_size = ds->xattr_map_size; - set_stat (source, &st1, NULL, 0, 0, SYMTYPE); - valid_source = source; - } -@@ -1348,6 +1458,9 @@ apply_delayed_links (void) - sources = next; - } - -+ xheader_xattr_free (ds->xattr_map, ds->xattr_map_size); -+ free (ds->cntx_name); -+ - { - struct delayed_link *next = ds->next; - free (ds); -diff -urNp tar-1.23-orig/src/list.c tar-1.23/src/list.c ---- tar-1.23-orig/src/list.c 2010-03-12 13:40:53.000000000 +0100 -+++ tar-1.23/src/list.c 2010-03-12 13:48:43.000000000 +0100 -@@ -585,6 +585,13 @@ decode_header (union block *header, stru - assign_string (&stat_info->gname, - header->header.gname[0] ? header->header.gname : NULL); - -+ stat_info->acls_a_ptr = NULL; -+ stat_info->acls_a_len = 0; -+ stat_info->acls_d_ptr = NULL; -+ stat_info->acls_d_len = 0; -+ stat_info->cntx_name = NULL; -+ xheader_xattr_init(stat_info); -+ - if (format == OLDGNU_FORMAT && incremental_option) - { - stat_info->atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime); -diff -urNp tar-1.23-orig/src/Makefile.am tar-1.23/src/Makefile.am ---- tar-1.23-orig/src/Makefile.am 2010-01-26 12:30:20.000000000 +0100 -+++ tar-1.23/src/Makefile.am 2010-03-12 13:48:43.000000000 +0100 -@@ -20,7 +20,7 @@ - - bin_PROGRAMS = tar - --noinst_HEADERS = arith.h common.h tar.h -+noinst_HEADERS = arith.h common.h tar.h xattrs.h - tar_SOURCES = \ - buffer.c\ - checkpoint.c\ -@@ -42,10 +42,11 @@ tar_SOURCES = \ - unlink.c\ - update.c\ - utf8.c\ -- warning.c -+ warning.c\ -+ xattrs.c - - INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib - - LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV) - --tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) -+tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) -diff -urNp tar-1.23-orig/src/tar.c tar-1.23/src/tar.c ---- tar-1.23-orig/src/tar.c 2010-03-09 13:52:41.000000000 +0100 -+++ tar-1.23/src/tar.c 2010-03-12 13:48:43.000000000 +0100 -@@ -255,7 +255,8 @@ tar_set_quoting_style (char *arg) - - enum - { -- ANCHORED_OPTION = CHAR_MAX + 1, -+ ACLS_OPTION = CHAR_MAX + 1, -+ ANCHORED_OPTION, - ATIME_PRESERVE_OPTION, - BACKUP_OPTION, - CHECK_DEVICE_OPTION, -@@ -287,6 +288,7 @@ enum - MODE_OPTION, - MTIME_OPTION, - NEWER_MTIME_OPTION, -+ NO_ACLS_OPTION, - NO_ANCHORED_OPTION, - NO_AUTO_COMPRESS_OPTION, - NO_CHECK_DEVICE_OPTION, -@@ -300,9 +302,11 @@ enum - NO_SAME_OWNER_OPTION, - NO_SAME_PERMISSIONS_OPTION, - NO_SEEK_OPTION, -+ NO_SELINUX_CONTEXT_OPTION, - NO_UNQUOTE_OPTION, - NO_WILDCARDS_MATCH_SLASH_OPTION, - NO_WILDCARDS_OPTION, -+ NO_XATTR_OPTION, - NULL_OPTION, - NUMERIC_OWNER_OPTION, - OCCURRENCE_OPTION, -@@ -324,6 +328,7 @@ enum - RMT_COMMAND_OPTION, - RSH_COMMAND_OPTION, - SAME_OWNER_OPTION, -+ SELINUX_CONTEXT_OPTION, - SHOW_DEFAULTS_OPTION, - SHOW_OMITTED_DIRS_OPTION, - SHOW_TRANSFORMED_NAMES_OPTION, -@@ -339,7 +344,8 @@ enum - VOLNO_FILE_OPTION, - WARNING_OPTION, - WILDCARDS_MATCH_SLASH_OPTION, -- WILDCARDS_OPTION -+ WILDCARDS_OPTION, -+ XATTR_OPTION - }; - - const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION; -@@ -485,6 +491,10 @@ static struct argp_option options[] = { - {NULL, 0, NULL, 0, - N_("Handling of file attributes:"), GRID }, - -+ {"acls", ACLS_OPTION, 0, 0, -+ N_("Save the ACLs to the archive"), GRID+1 }, -+ {"no-acls", NO_ACLS_OPTION, 0, 0, -+ N_("Don't extract the ACLs from the archive"), GRID+1 }, - {"owner", OWNER_OPTION, N_("NAME"), 0, - N_("force NAME as owner for added files"), GRID+1 }, - {"group", GROUP_OPTION, N_("NAME"), 0, -@@ -515,6 +525,14 @@ static struct argp_option options[] = { - {"preserve-order", 's', 0, 0, - N_("sort names to extract to match archive"), GRID+1 }, - {"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, -+ {"selinux", SELINUX_CONTEXT_OPTION, 0, 0, -+ N_("Save the SELinux context to the archive"), GRID+1 }, -+ {"no-selinux", NO_SELINUX_CONTEXT_OPTION, 0, 0, -+ N_("Don't extract the SELinux context from the archive"), GRID+1 }, -+ {"xattrs", XATTR_OPTION, 0, 0, -+ N_("Save the user/root xattrs to the archive"), GRID+1 }, -+ {"no-xattrs", NO_XATTR_OPTION, 0, 0, -+ N_("Don't extract the user/root xattrs from the archive"), GRID+1 }, - {"preserve", PRESERVE_OPTION, 0, 0, - N_("same as both -p and -s"), GRID+1 }, - {"delay-directory-restore", DELAY_DIRECTORY_RESTORE_OPTION, 0, 0, -@@ -2060,6 +2078,37 @@ parse_opt (int key, char *arg, struct ar - same_permissions_option = -1; - break; - -+ case ACLS_OPTION: -+ set_archive_format ("posix"); -+ acls_option = 1; -+ break; -+ -+ case NO_ACLS_OPTION: -+ acls_option = -1; -+ break; -+ -+ case SELINUX_CONTEXT_OPTION: -+ set_archive_format ("posix"); -+ selinux_context_option = 1; -+ break; -+ -+ case NO_SELINUX_CONTEXT_OPTION: -+ selinux_context_option = -1; -+ break; -+ -+ case XATTR_OPTION: -+ set_archive_format ("posix"); -+ if (!acls_option) acls_option = 1; -+ if (!selinux_context_option) selinux_context_option = 1; -+ xattrs_option = 1; -+ break; -+ -+ case NO_XATTR_OPTION: -+ if (!acls_option) acls_option = -1; -+ if (!selinux_context_option) selinux_context_option = -1; -+ xattrs_option = -1; -+ break; -+ - case RECURSION_OPTION: - recursion_option = FNM_LEADING_DIR; - break; -@@ -2442,6 +2491,29 @@ decode_options (int argc, char **argv) - || subcommand_option != LIST_SUBCOMMAND)) - USAGE_ERROR ((0, 0, _("--pax-option can be used only on POSIX archives"))); - -+ /* star create's non-POSIX typed archives with xattr support, so allow the -+ extra headers */ -+ if ((acls_option > 0) -+ && archive_format != POSIX_FORMAT -+ && (subcommand_option != EXTRACT_SUBCOMMAND -+ || subcommand_option != DIFF_SUBCOMMAND -+ || subcommand_option != LIST_SUBCOMMAND)) -+ USAGE_ERROR ((0, 0, _("--acls can be used only on POSIX archives"))); -+ -+ if ((selinux_context_option > 0) -+ && archive_format != POSIX_FORMAT -+ && (subcommand_option != EXTRACT_SUBCOMMAND -+ || subcommand_option != DIFF_SUBCOMMAND -+ || subcommand_option != LIST_SUBCOMMAND)) -+ USAGE_ERROR ((0, 0, _("--selinux can be used only on POSIX archives"))); -+ -+ if ((xattrs_option > 0) -+ && archive_format != POSIX_FORMAT -+ && (subcommand_option != EXTRACT_SUBCOMMAND -+ || subcommand_option != DIFF_SUBCOMMAND -+ || subcommand_option != LIST_SUBCOMMAND)) -+ USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives"))); -+ - /* If ready to unlink hierarchies, so we are for simpler files. */ - if (recursive_unlink_option) - old_files_option = UNLINK_FIRST_OLD_FILES; -@@ -2662,11 +2734,15 @@ tar_stat_init (struct tar_stat_info *st) - void - tar_stat_destroy (struct tar_stat_info *st) - { -+ xheader_xattr_free (st->xattr_map, st->xattr_map_size); - free (st->orig_file_name); - free (st->file_name); - free (st->link_name); - free (st->uname); - free (st->gname); -+ free (st->cntx_name); -+ free (st->acls_a_ptr); -+ free (st->acls_d_ptr); - free (st->sparse_map); - free (st->dumpdir); - xheader_destroy (&st->xhdr); -diff -urNp tar-1.23-orig/src/tar.h tar-1.23/src/tar.h ---- tar-1.23-orig/src/tar.h 2010-01-26 12:30:20.000000000 +0100 -+++ tar-1.23/src/tar.h 2010-03-12 13:48:43.000000000 +0100 -@@ -276,6 +276,14 @@ struct xheader - uintmax_t string_length; - }; - -+/* Information about xattrs for a file. */ -+struct xattr_array -+ { -+ char *xkey; -+ char *xval_ptr; -+ size_t xval_len; -+ }; -+ - struct tar_stat_info - { - char *orig_file_name; /* name of file read from the archive header */ -@@ -287,6 +295,15 @@ struct tar_stat_info - - char *uname; /* user name of owner */ - char *gname; /* group name of owner */ -+ -+ char *cntx_name; /* SELinux context for the current archive entry. */ -+ -+ char *acls_a_ptr; /* Access ACLs for the current archive entry. */ -+ size_t acls_a_len; /* Access ACLs for the current archive entry. */ -+ -+ char *acls_d_ptr; /* Default ACLs for the current archive entry. */ -+ size_t acls_d_len; /* Default ACLs for the current archive entry. */ -+ - struct stat stat; /* regular filesystem stat */ - - /* STAT doesn't always have access, data modification, and status -@@ -309,6 +326,9 @@ struct tar_stat_info - size_t sparse_map_size; /* Size of the sparse map */ - struct sp_array *sparse_map; - -+ size_t xattr_map_size; /* Size of the xattr map */ -+ struct xattr_array *xattr_map; -+ - /* Extended headers */ - struct xheader xhdr; - -diff -urNp tar-1.23-orig/src/xattrs.c tar-1.23/src/xattrs.c ---- tar-1.23-orig/src/xattrs.c 1970-01-01 01:00:00.000000000 +0100 -+++ tar-1.23/src/xattrs.c 2010-03-12 13:48:43.000000000 +0100 -@@ -0,0 +1,488 @@ -+/* Create a tar archive. -+ -+ Copyright (C) 2006 Free Software Foundation, Inc. -+ -+ Written by James Antill, on 2006-07-27. -+ -+ This program is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by the -+ Free Software Foundation; either version 2, or (at your option) any later -+ version. -+ -+ This program is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+ Public License for more details. -+ -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ -+#include <system.h> -+ -+#include <quotearg.h> -+ -+#include "common.h" -+ -+ -+#ifndef HAVE_SELINUX_SELINUX_H -+# undef HAVE_LIBSELINUX -+#endif -+ -+#ifndef HAVE_ATTR_XATTR_H -+# undef HAVE_XATTRS -+#endif -+ -+#ifndef HAVE_SYS_ACL_H -+# undef HAVE_LIBACL -+#endif -+ -+#ifdef HAVE_SELINUX_SELINUX_H -+# include <selinux/selinux.h> -+#endif -+ -+#ifdef HAVE_ATTR_XATTR_H -+# include <attr/xattr.h> -+#endif -+ -+#ifdef HAVE_SYS_ACL_H -+# include <sys/acl.h> -+#endif -+ -+ -+#if 0 /* unused by xattr's atm. */ -+static void xattrs__fd_get(struct tar_stat_info *st, -+ char const *file_name, int fd, const char *attr, -+ char **ret_ptr, size_t *ret_len) -+{ -+#ifdef HAVE_XATTRS -+ static ssize_t asz = 1024; -+ ssize_t ret = 0; -+ static char *val = NULL; -+ -+ if (!val) val = xmalloc (asz); -+ -+ while (((ret = fgetxattr (fd, attr, val, asz)) == -1) && -+ (errno == ERANGE)) -+ { -+ asz <<= 1; -+ val = xrealloc (val, asz); -+ } -+ -+ if (ret != -1) -+ { -+ *ret_ptr = xmemdup (val, ret + 1); -+ *ret_len = ret; -+ } -+ else if (errno != ENOATTR) -+ call_arg_warn ("fgetxattr", file_name); -+#endif -+} -+#endif -+ -+static void xattrs__acls_get_a(struct tar_stat_info *st, -+ char const *file_name, int fd, -+ char **ret_ptr, size_t *ret_len) -+{ /* "system.posix_acl_access" */ -+#ifdef HAVE_LIBACL -+ char *val = NULL; -+ ssize_t len; -+ acl_t acl; -+ -+ if (fd != -1) -+ { -+ if ((acl = acl_get_fd (fd)) == (acl_t)NULL) -+ { -+ if (errno != ENOTSUP) -+ call_arg_warn ("acl_get_fd", file_name); -+ return; -+ } -+ } -+ else if ((acl = acl_get_file (file_name, ACL_TYPE_ACCESS)) == (acl_t)NULL) -+ { -+ if (errno != ENOTSUP) -+ call_arg_warn ("acl_get_file", file_name); -+ return; -+ } -+ -+ -+ val = acl_to_text(acl, &len); -+ acl_free (acl); -+ -+ if (val == NULL) -+ { -+ call_arg_warn ("acl_to_text", file_name); -+ return; -+ } -+ -+ *ret_ptr = xstrdup (val); -+ *ret_len = len; -+ -+ acl_free (val); -+#endif -+} -+ -+static void xattrs__acls_get_d(struct tar_stat_info *st, -+ char const *file_name, -+ char **ret_ptr, size_t *ret_len) -+{ /* "system.posix_acl_default" */ -+#ifdef HAVE_LIBACL -+ char *val = NULL; -+ ssize_t len; -+ acl_t acl; -+ -+ if ((acl = acl_get_file (file_name, ACL_TYPE_DEFAULT)) == (acl_t)NULL) -+ { -+ if (errno != ENOTSUP) -+ call_arg_warn ("acl_get_file", file_name); -+ return; -+ } -+ -+ val = acl_to_text(acl, &len); -+ acl_free (acl); -+ -+ if (val == NULL) -+ { -+ call_arg_warn ("acl_to_text", file_name); -+ return; -+ } -+ -+ *ret_ptr = xstrdup (val); -+ *ret_len = len; -+ -+ acl_free (val); -+#endif -+} -+ -+void xattrs_acls_get(struct tar_stat_info *st, char const *file_name, int fd, -+ int xisfile) -+{ -+ if (acls_option > 0) -+ { -+#ifndef HAVE_LIBACL -+ static int done = 0; -+ if (!done) -+ WARN ((0, 0, _("ACL support requested, but not available"))); -+ done = 1; -+#endif -+ xattrs__acls_get_a (st, file_name, fd, -+ &st->acls_a_ptr, &st->acls_a_len); -+ if (!xisfile) -+ xattrs__acls_get_d (st, file_name, -+ &st->acls_d_ptr, &st->acls_d_len); -+ } -+} -+ -+void xattrs_selinux_get(struct tar_stat_info *st, char const *file_name, int fd) -+{ -+ if (selinux_context_option > 0) -+ { -+#ifndef HAVE_LIBSELINUX -+ static int done = 0; -+ if (!done) -+ WARN ((0, 0, _("SELinux support requested, but not available"))); -+ done = 1; -+#else -+ if (fd == -1) -+ { -+ if ((lgetfilecon (file_name, &st->cntx_name) == -1) && (errno != ENOTSUP) && (errno != ENODATA)) -+ call_arg_warn ("lgetfilecon", file_name); -+ } -+ else if ((fgetfilecon (fd, &st->cntx_name) == -1) && (errno != ENOTSUP) && (errno != ENODATA)) -+ call_arg_warn ("fgetfilecon", file_name); -+#endif -+ } -+} -+ -+void xattrs_xattrs_get(struct tar_stat_info *st, char const *file_name, int fd) -+{ -+ if (xattrs_option > 0) -+ { /* get all xattrs ... this include security.* and system.* if -+ available. We filter them here, but we have to filter them -+ in xattrs_xattrs_set() anyway. -+ */ -+ static ssize_t xsz = 1024; -+ static char *xatrs = NULL; -+ ssize_t xret = -1; -+ -+#ifndef HAVE_XATTRS -+ static int done = 0; -+ if ((xattrs_option > 0) && !done) -+ WARN ((0, 0, _("Xattr support requested, but not available"))); -+ done = 1; -+#else -+ -+ if (!xatrs) xatrs = xmalloc (xsz); -+ -+ while (((fd == -1) ? -+ ((xret = llistxattr (file_name, xatrs, xsz)) == -1) : -+ ((xret = flistxattr (fd, xatrs, xsz)) == -1)) && -+ (errno == ERANGE)) -+ { -+ xsz <<= 1; -+ xatrs = xrealloc (xatrs, xsz); -+ } -+ -+ if (xret == -1) -+ call_arg_warn ((fd == -1) ? "llistxattrs" : "flistxattrs", file_name); -+ else -+ { -+ const char *attr = xatrs; -+ static ssize_t asz = 1024; -+ static char *val = NULL; -+ -+ if (!val) val = xmalloc (asz); -+ -+ while (xret > 0) -+ { -+ size_t len = strlen (attr); -+ ssize_t aret = 0; -+ -+ /* Archive all xattrs during creation, decide at extraction time -+ * which ones are of interest/use for the target filesystem. */ -+ while (((fd == -1) ? -+ ((aret = lgetxattr (file_name, attr, val, asz)) == -1) : -+ ((aret = fgetxattr (fd, attr, val, asz)) == -1)) && -+ (errno == ERANGE)) -+ { -+ asz <<= 1; -+ val = xrealloc (val, asz); -+ } -+ -+ if (aret != -1) -+ xheader_xattr_add (st, attr, val, aret); -+ else if (errno != ENOATTR) -+ call_arg_warn ((fd==-1) ? "lgetxattr" : "fgetxattr", file_name); -+ -+ attr += len + 1; -+ xret -= len + 1; -+ } -+ } -+#endif -+ } -+} -+ -+static void xattrs__fd_set(struct tar_stat_info const *st, -+ char const *file_name, char typeflag, -+ const char *attr, -+ const char *ptr, size_t len) -+{ -+#ifdef HAVE_XATTRS -+ if (ptr) -+ { -+ const char *sysname = "setxattr"; -+ int ret = -1; -+ -+ if (typeflag != SYMTYPE) -+ ret = setxattr (file_name, attr, ptr, len, 0); -+ else -+ { -+ sysname = "lsetxattr"; -+ ret = lsetxattr (file_name, attr, ptr, len, 0); -+ } -+ -+ /* do not print warnings when SELinux is disabled */ -+ if ((ret == -1) && (errno != EPERM) && (errno != ENOTSUP)) -+ call_arg_error(sysname, file_name); -+ } -+#endif -+} -+ -+/* convert unix permissions into an ACL ... needed due to "default" ACLs */ -+#ifdef HAVE_LIBACL -+static acl_t perms2acl(int perms) -+{ -+ char val[] = "user::---,group::---,other::---"; -+ /* 0123456789 123456789 123456789 123456789 */ -+ -+ /* user */ -+ if (perms & 0400) val[ 6] = 'r'; -+ if (perms & 0200) val[ 7] = 'w'; -+ if (perms & 0100) val[ 8] = 'x'; -+ -+ /* group */ -+ if (perms & 0040) val[17] = 'r'; -+ if (perms & 0020) val[18] = 'w'; -+ if (perms & 0010) val[19] = 'x'; -+ -+ /* other */ -+ if (perms & 0004) val[28] = 'r'; -+ if (perms & 0002) val[29] = 'w'; -+ if (perms & 0001) val[30] = 'x'; -+ -+ return (acl_from_text (val)); -+} -+#endif -+ -+static char *skip_to_ext_fields(char *ptr) -+{ -+ ptr += strcspn(ptr, ":,\n"); /* skip tag name. Ie. user/group/default/mask */ -+ -+ if (*ptr != ':') -+ return (ptr); /* error? no user/group field */ -+ ++ptr; -+ -+ ptr += strcspn(ptr, ":,\n"); /* skip user/group name */ -+ -+ if (*ptr != ':') -+ return (ptr); /* error? no perms field */ -+ ++ptr; -+ -+ ptr += strcspn(ptr, ":,\n"); /* skip perms */ -+ -+ if (*ptr != ':') -+ return (ptr); /* no extra fields */ -+ -+ return (ptr); -+} -+ -+/* The POSIX draft allows extra fields after the three main ones. Star -+ uses this to add a fourth field for user/group which is the numeric ID. -+ We just skip all extra fields atm. */ -+static const char *fixup_extra_acl_fields(const char *ptr) -+{ -+ char *src = (char *)ptr; -+ char *dst = (char *)ptr; -+ -+ while (*src) -+ { -+ const char *old = src; -+ size_t len = 0; -+ -+ src = skip_to_ext_fields(src); -+ len = src - old; -+ if (old != dst) memmove(dst, old, len); -+ dst += len; -+ -+ if (*src == ':') /* We have extra fields, skip them all */ -+ src += strcspn(src, "\n,"); -+ -+ if ((*src == '\n') || (*src == ',')) -+ *dst++ = *src++; /* also done when dst == src, but that's ok */ -+ } -+ if (src != dst) -+ *dst = 0; -+ -+ return ptr; -+} -+ -+static void xattrs__acls_set(struct tar_stat_info const *st, -+ char const *file_name, int type, -+ const char *ptr, size_t len) -+{ /* "system.posix_acl_access" */ -+#ifdef HAVE_LIBACL -+ acl_t acl; -+ -+ if (ptr) -+ { -+ /* assert (strlen (ptr) == len); */ -+ ptr = fixup_extra_acl_fields(ptr); -+ -+ acl = acl_from_text (ptr); -+ acls_option = 1; -+ } -+ else if (acls_option > 0) -+ acl = perms2acl (st->stat.st_mode); -+ else -+ return; /* don't call acl functions unless we first hit an ACL, or -+ --acls was passed explicitly */ -+ -+ if (acl == (acl_t)NULL) -+ { -+ call_arg_warn ("acl_from_text", file_name); -+ return; -+ } -+ -+ if (acl_set_file (file_name, type, acl) == -1) -+ { -+ if (errno != ENOTSUP) -+ call_arg_warn ("acl_set_file", file_name); -+ } -+ acl_free (acl); -+#endif -+} -+ -+void xattrs_acls_set(struct tar_stat_info const *st, -+ char const *file_name, char typeflag) -+{ -+ if ((acls_option >= 0) && (typeflag != SYMTYPE)) -+ { -+#ifndef HAVE_LIBACL -+ static int done = 0; -+ if (!done) -+ WARN ((0, 0, _("ACL support requested, but not available"))); -+ done = 1; -+#else -+ xattrs__acls_set (st, file_name, ACL_TYPE_ACCESS, -+ st->acls_a_ptr, st->acls_a_len); -+ if ((typeflag == DIRTYPE) || (typeflag == GNUTYPE_DUMPDIR)) -+ xattrs__acls_set (st, file_name, ACL_TYPE_DEFAULT, -+ st->acls_d_ptr, st->acls_d_len); -+#endif -+ } -+} -+ -+void xattrs_selinux_set(struct tar_stat_info const *st, -+ char const *file_name, char typeflag) -+{ -+ if ((selinux_context_option >= 0) && st->cntx_name) -+ { -+ const char *sysname = "setfilecon"; -+ int ret = -1; -+ -+#ifndef HAVE_LIBSELINUX -+ static int done = 0; -+ if (!done) -+ WARN ((0, 0, _("SELinux support requested, but not available"))); -+ done = 1; -+#else -+ if (typeflag != SYMTYPE) -+ ret = setfilecon (file_name, st->cntx_name); -+ else -+ { -+ sysname = "lsetfilecon"; -+ ret = lsetfilecon (file_name, st->cntx_name); -+ } -+ -+ if ((ret == -1) && (errno == EPERM)) -+ call_arg_warn(sysname, file_name); -+ else if ((ret == -1) && (errno != EOPNOTSUPP)) -+ call_arg_error(sysname, file_name); -+#endif -+ } -+} -+ -+void xattrs_xattrs_set(struct tar_stat_info const *st, -+ char const *file_name, char typeflag) -+{ -+ if ((xattrs_option >= 0) && st->xattr_map_size) -+ { -+ size_t scan = 0; -+ -+#ifndef HAVE_XATTRS -+ static int done = 0; -+ if (!done) -+ WARN ((0, 0, _("Xattr support requested, but not available"))); -+ done = 1; -+#else -+ while (scan < st->xattr_map_size) -+ { -+ char *keyword = st->xattr_map[scan].xkey; -+ -+ /* assert (!memcpy (keyword, "SCHILY.xattr.", strlen("SCHILY.xattr."))); */ -+ keyword += strlen("SCHILY.xattr."); -+ -+ if (strncmp (keyword, "user.", strlen("user.")) && -+ strncmp (keyword, "lustre.", strlen("lustre.")) && -+ strncmp (keyword, "trusted.", strlen("trusted."))) -+ continue; /* don't try and set anything but normal xattrs */ -+ -+ xattrs__fd_set (st, file_name, typeflag, keyword, -+ st->xattr_map[scan].xval_ptr, -+ st->xattr_map[scan].xval_len); -+ -+ ++scan; -+ } -+#endif -+ } -+} -diff -urNp tar-1.23-orig/src/xattrs.h tar-1.23/src/xattrs.h ---- tar-1.23-orig/src/xattrs.h 1970-01-01 01:00:00.000000000 +0100 -+++ tar-1.23/src/xattrs.h 2010-03-12 13:48:43.000000000 +0100 -@@ -0,0 +1,14 @@ -+ -+extern void xattrs_acls_get(struct tar_stat_info *st, -+ char const *file_name, int fd, int xisfile); -+extern void xattrs_selinux_get(struct tar_stat_info *st, -+ char const *file_name, int fd); -+extern void xattrs_xattrs_get(struct tar_stat_info *st, -+ char const *file_name, int fd); -+ -+extern void xattrs_acls_set(struct tar_stat_info const *st, -+ char const *file_name, char typeflag); -+extern void xattrs_selinux_set(struct tar_stat_info const *st, -+ char const *file_name, char typeflag); -+extern void xattrs_xattrs_set(struct tar_stat_info const *st, -+ char const *file_name, char typeflag); -diff -urNp tar-1.23-orig/src/xheader.c tar-1.23/src/xheader.c ---- tar-1.23-orig/src/xheader.c 2010-02-12 11:03:09.000000000 +0100 -+++ tar-1.23/src/xheader.c 2010-03-12 13:50:44.000000000 +0100 -@@ -459,6 +459,74 @@ xheader_write_global (struct xheader *xh - } - } - -+void xheader_xattr_init(struct tar_stat_info *st) -+{ -+ st->xattr_map = NULL; -+ st->xattr_map_size = 0; -+} -+ -+void xheader_xattr_free(struct xattr_array *xattr_map, size_t xattr_map_size) -+{ -+ size_t scan = 0; -+ -+ while (scan < xattr_map_size) -+ { -+ free (xattr_map[scan].xkey); -+ free (xattr_map[scan].xval_ptr); -+ -+ ++scan; -+ } -+ free (xattr_map); -+} -+ -+static void xheader_xattr__add(struct xattr_array **xattr_map, -+ size_t *xattr_map_size, -+ const char *key, const char *val, size_t len) -+{ -+ size_t pos = (*xattr_map_size)++; -+ -+ *xattr_map = xrealloc (*xattr_map, -+ *xattr_map_size * sizeof(struct xattr_array)); -+ (*xattr_map)[pos].xkey = xstrdup (key); -+ (*xattr_map)[pos].xval_ptr = xmemdup (val, len + 1); -+ (*xattr_map)[pos].xval_len = len; -+} -+ -+void xheader_xattr_add(struct tar_stat_info *st, -+ const char *key, const char *val, size_t len) -+{ -+ size_t klen = strlen (key); -+ char *xkey = xmalloc (strlen("SCHILY.xattr.") + klen + 1); -+ char *tmp = xkey; -+ -+ tmp = stpcpy (tmp, "SCHILY.xattr."); -+ tmp = stpcpy (tmp, key); -+ -+ xheader_xattr__add (&st->xattr_map, &st->xattr_map_size, xkey, val, len); -+ -+ free (xkey); -+} -+ -+void xheader_xattr_copy(const struct tar_stat_info *st, -+ struct xattr_array **xattr_map, size_t *xattr_map_size) -+{ -+ size_t scan = 0; -+ -+ *xattr_map = NULL; -+ *xattr_map_size = 0; -+ -+ while (scan < st->xattr_map_size) -+ { -+ char *key = st->xattr_map[scan].xkey; -+ char *val = st->xattr_map[scan].xval_ptr; -+ size_t len = st->xattr_map[scan].xval_len; -+ -+ xheader_xattr__add(xattr_map, xattr_map_size, key, val, len); -+ -+ ++scan; -+ } -+} -+ - - /* General Interface */ - -@@ -472,6 +540,7 @@ struct xhdr_tab - struct xheader *, void const *data); - void (*decoder) (struct tar_stat_info *, char const *, char const *, size_t); - int flags; -+ bool prefix; - }; - - /* This declaration must be extern, because ISO C99 section 6.9.2 -@@ -488,8 +557,17 @@ locate_handler (char const *keyword) - struct xhdr_tab const *p; - - for (p = xhdr_tab; p->keyword; p++) -- if (strcmp (p->keyword, keyword) == 0) -- return p; -+ if (p->prefix) -+ { -+ if (strncmp (p->keyword, keyword, strlen(p->keyword)) == 0) -+ return p; -+ } -+ else -+ { -+ if (strcmp (p->keyword, keyword) == 0) -+ return p; -+ } -+ - return NULL; - } - -@@ -499,7 +577,7 @@ xheader_protected_pattern_p (const char - struct xhdr_tab const *p; - - for (p = xhdr_tab; p->keyword; p++) -- if ((p->flags & XHDR_PROTECTED) && fnmatch (pattern, p->keyword, 0) == 0) -+ if (!p->prefix && (p->flags & XHDR_PROTECTED) && fnmatch (pattern, p->keyword, 0) == 0) - return true; - return false; - } -@@ -510,7 +588,7 @@ xheader_protected_keyword_p (const char - struct xhdr_tab const *p; - - for (p = xhdr_tab; p->keyword; p++) -- if ((p->flags & XHDR_PROTECTED) && strcmp (p->keyword, keyword) == 0) -+ if (!p->prefix && (p->flags & XHDR_PROTECTED) && strcmp (p->keyword, keyword) == 0) - return true; - return false; - } -@@ -1469,6 +1547,71 @@ volume_filename_decoder (struct tar_stat - } - - static void -+xattr_selinux_coder (struct tar_stat_info const *st, char const *keyword, -+ struct xheader *xhdr, void const *data) -+{ -+ code_string (st->cntx_name, keyword, xhdr); -+} -+ -+static void -+xattr_selinux_decoder (struct tar_stat_info *st, -+ char const *keyword, char const *arg, size_t size) -+{ -+ decode_string (&st->cntx_name, arg); -+} -+ -+static void -+xattr_acls_a_coder (struct tar_stat_info const *st , char const *keyword, -+ struct xheader *xhdr, void const *data) -+{ -+ xheader_print_n (xhdr, keyword, st->acls_a_ptr, st->acls_a_len); -+} -+ -+static void -+xattr_acls_a_decoder (struct tar_stat_info *st, -+ char const *keyword, char const *arg, size_t size) -+{ -+ st->acls_a_ptr = xmemdup (arg, size + 1); -+ st->acls_a_len = size; -+} -+ -+static void -+xattr_acls_d_coder (struct tar_stat_info const *st , char const *keyword, -+ struct xheader *xhdr, void const *data) -+{ -+ xheader_print_n (xhdr, keyword, st->acls_d_ptr, st->acls_d_len); -+} -+ -+static void -+xattr_acls_d_decoder (struct tar_stat_info *st, -+ char const *keyword, char const *arg, size_t size) -+{ -+ st->acls_d_ptr = xmemdup (arg, size + 1); -+ st->acls_d_len = size; -+} -+ -+static void -+xattr_coder (struct tar_stat_info const *st , char const *keyword, -+ struct xheader *xhdr, void const *data) -+{ -+ struct xattr_array *xattr_map = st->xattr_map; -+ const size_t *off = data; -+ xheader_print_n (xhdr, keyword, -+ xattr_map[*off].xval_ptr, xattr_map[*off].xval_len); -+} -+ -+static void -+xattr_decoder (struct tar_stat_info *st, -+ char const *keyword, char const *arg, size_t size) -+{ -+ char *xstr = NULL; -+ -+ xstr = xmemdup(arg, size + 1); -+ xheader_xattr_add(st, keyword + strlen("SCHILY.xattr."), xstr, size); -+ free(xstr); -+} -+ -+static void - sparse_major_coder (struct tar_stat_info const *st, char const *keyword, - struct xheader *xhdr, void const *data) - { -@@ -1505,53 +1648,53 @@ sparse_minor_decoder (struct tar_stat_in - } - - struct xhdr_tab const xhdr_tab[] = { -- { "atime", atime_coder, atime_decoder, 0 }, -- { "comment", dummy_coder, dummy_decoder, 0 }, -- { "charset", dummy_coder, dummy_decoder, 0 }, -- { "ctime", ctime_coder, ctime_decoder, 0 }, -- { "gid", gid_coder, gid_decoder, 0 }, -- { "gname", gname_coder, gname_decoder, 0 }, -- { "linkpath", linkpath_coder, linkpath_decoder, 0 }, -- { "mtime", mtime_coder, mtime_decoder, 0 }, -- { "path", path_coder, path_decoder, 0 }, -- { "size", size_coder, size_decoder, 0 }, -- { "uid", uid_coder, uid_decoder, 0 }, -- { "uname", uname_coder, uname_decoder, 0 }, -+ { "atime", atime_coder, atime_decoder, 0, false }, -+ { "comment", dummy_coder, dummy_decoder, 0, false }, -+ { "charset", dummy_coder, dummy_decoder, 0, false }, -+ { "ctime", ctime_coder, ctime_decoder, 0, false }, -+ { "gid", gid_coder, gid_decoder, 0, false }, -+ { "gname", gname_coder, gname_decoder, 0, false }, -+ { "linkpath", linkpath_coder, linkpath_decoder, 0, false }, -+ { "mtime", mtime_coder, mtime_decoder, 0, false }, -+ { "path", path_coder, path_decoder, 0, false }, -+ { "size", size_coder, size_decoder, 0, false }, -+ { "uid", uid_coder, uid_decoder, 0, false }, -+ { "uname", uname_coder, uname_decoder, 0, false }, - - /* Sparse file handling */ - { "GNU.sparse.name", path_coder, path_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - { "GNU.sparse.major", sparse_major_coder, sparse_major_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - { "GNU.sparse.minor", sparse_minor_coder, sparse_minor_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - { "GNU.sparse.realsize", sparse_size_coder, sparse_size_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - { "GNU.sparse.numblocks", sparse_numblocks_coder, sparse_numblocks_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - - /* tar 1.14 - 1.15.90 keywords. */ - { "GNU.sparse.size", sparse_size_coder, sparse_size_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - /* tar 1.14 - 1.15.1 keywords. Multiple instances of these appeared in 'x' - headers, and each of them was meaningful. It confilcted with POSIX specs, - which requires that "when extended header records conflict, the last one - given in the header shall take precedence." */ - { "GNU.sparse.offset", sparse_offset_coder, sparse_offset_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - { "GNU.sparse.numbytes", sparse_numbytes_coder, sparse_numbytes_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - /* tar 1.15.90 keyword, introduced to remove the above-mentioned conflict. */ - { "GNU.sparse.map", NULL /* Unused, see pax_dump_header() */, -- sparse_map_decoder, 0 }, -+ sparse_map_decoder, 0, false }, - - { "GNU.dumpdir", dumpdir_coder, dumpdir_decoder, -- XHDR_PROTECTED }, -+ XHDR_PROTECTED, false }, - - /* Keeps the tape/volume label. May be present only in the global headers. - Equivalent to GNUTYPE_VOLHDR. */ - { "GNU.volume.label", volume_label_coder, volume_label_decoder, -- XHDR_PROTECTED | XHDR_GLOBAL }, -+ XHDR_PROTECTED | XHDR_GLOBAL, false }, - - /* These may be present in a first global header of the archive. - They provide the same functionality as GNUTYPE_MULTIVOL header. -@@ -1560,11 +1703,40 @@ struct xhdr_tab const xhdr_tab[] = { - GNU.volume.offset keeps the offset of the start of this volume, - otherwise kept in oldgnu_header.offset. */ - { "GNU.volume.filename", volume_label_coder, volume_filename_decoder, -- XHDR_PROTECTED | XHDR_GLOBAL }, -+ XHDR_PROTECTED | XHDR_GLOBAL, false }, - { "GNU.volume.size", volume_size_coder, volume_size_decoder, -- XHDR_PROTECTED | XHDR_GLOBAL }, -+ XHDR_PROTECTED | XHDR_GLOBAL, false }, - { "GNU.volume.offset", volume_offset_coder, volume_offset_decoder, -- XHDR_PROTECTED | XHDR_GLOBAL }, -+ XHDR_PROTECTED | XHDR_GLOBAL, false }, -+ -+ /* We get the SELinux value from filecon, so add a namespace for SELinux -+ instead of storing it in SCHILY.xattr.* (which would be RAW). */ -+ { "RHT.security.selinux", -+ xattr_selinux_coder, xattr_selinux_decoder, 0, false }, -+ -+ /* ACLs, use the star format... */ -+ { "SCHILY.acl.access", -+ xattr_acls_a_coder, xattr_acls_a_decoder, 0, false }, -+ -+ { "SCHILY.acl.default", -+ xattr_acls_d_coder, xattr_acls_d_decoder, 0, false }, -+ -+ /* FIXME: These are compat. for FC-6 ... we shipped a tar using the generic -+ header names by accident. */ -+ { "SCHILY.xattr.security.selinux", -+ xattr_selinux_coder, xattr_selinux_decoder, 0, false }, -+ { "SCHILY.xattr.system.posix_acl_access", -+ xattr_acls_a_coder, xattr_acls_a_decoder, 0, false }, -+ { "SCHILY.xattr.system.posix_acl_default", -+ xattr_acls_d_coder, xattr_acls_d_decoder, 0, false }, -+ -+ /* xattrs use the star format. note we only save some variants... */ -+ { "SCHILY.xattr.user", xattr_coder, xattr_decoder, 0, true }, -+ { "SCHILY.xattr.trusted", xattr_coder, xattr_decoder, 0, true }, -+ { "SCHILY.xattr.lustre", xattr_coder, xattr_decoder, 0, true }, -+ -+ /* ignore everything else in the xattr namespaces... */ -+ { "SCHILY.xattr", dummy_coder, dummy_decoder, 0, true }, - -- { NULL, NULL, NULL, 0 } -+ { NULL, NULL, NULL, 0, false } - }; diff --git a/pkgs/core/tar/patches/tar-1.24-xattrs.patch b/pkgs/core/tar/patches/tar-1.24-xattrs.patch new file mode 100644 index 0000000..1623be2 --- /dev/null +++ b/pkgs/core/tar/patches/tar-1.24-xattrs.patch @@ -0,0 +1,1617 @@ +diff -urNp tar-1.24-orig/configure.ac tar-1.24/configure.ac +--- tar-1.24-orig/configure.ac 2010-10-24 23:35:35.000000000 +0200 ++++ tar-1.24/configure.ac 2010-10-25 10:24:52.548214037 +0200 +@@ -44,7 +44,7 @@ AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h + sys/param.h sys/device.h sys/gentape.h \ + sys/inet.h sys/io/trioctl.h \ + sys/mtio.h sys/time.h sys/tprintf.h sys/tape.h \ +- unistd.h locale.h) ++ unistd.h locale.h attr/xattr.h sys/acl.h) + + AC_CHECK_HEADERS([sys/buf.h], [], [], + [#if HAVE_SYS_PARAM_H +@@ -91,6 +91,12 @@ gl_INIT + tar_PAXUTILS + + AC_CHECK_FUNCS_ONCE([fchmod fchown fsync lstat mkfifo readlink symlink]) ++AC_CHECK_FUNCS(getxattr fgetxattr lgetxattr \ ++ setxattr fsetxattr lsetxattr \ ++ listxattr flistxattr llistxattr, ++ AC_DEFINE(HAVE_XATTRS,,[Define if we have a working extended attributes]),) ++AC_CHECK_LIB(acl, acl_get_fd) ++ + AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>]) + AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>]) + AC_CHECK_DECLS([time],,, [#include <time.h>]) +@@ -214,6 +220,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_QUOTING_STYLE + # Iconv + AM_ICONV + AC_CHECK_HEADERS(iconv.h) ++AC_CHECK_HEADERS(attr/xattr.h) + AC_CHECK_TYPE(iconv_t,:, + AC_DEFINE(iconv_t, int, + [Conversion descriptor type]), +@@ -223,6 +230,17 @@ AC_CHECK_TYPE(iconv_t,:, + #endif + ]) + ++AC_ARG_ENABLE(selinux, ++ AC_HELP_STRING([--enable-selinux], ++ [enable SELinux support (disabled by default)]), ++ [selinux_enabled=$enableval], ++ [selinux_enabled=no]) ++ ++if test "x$selinux_enabled" = xyes; then ++ AC_CHECK_LIB(selinux, getfilecon) ++ AC_CHECK_HEADERS(selinux/selinux.h) ++fi ++ + # Gettext. + AM_GNU_GETTEXT([external], [need-formatstring-macros]) + AM_GNU_GETTEXT_VERSION([0.16]) +diff -urNp tar-1.24-orig/doc/tar.texi tar-1.24/doc/tar.texi +--- tar-1.24-orig/doc/tar.texi 2010-10-24 20:07:54.000000000 +0200 ++++ tar-1.24/doc/tar.texi 2010-10-25 10:24:52.554213688 +0200 +@@ -2370,6 +2370,10 @@ Normally when creating an archive, @comm + @samp{/} from member names. This option disables that behavior. + @xref{absolute}. + ++@opsummary{acl} ++@item --acls ++Causes @command{tar} to store ACL's. @xref{Attributes}. ++ + @opsummary{after-date} + @item --after-date + +@@ -2915,6 +2919,10 @@ contents have changed (as opposed to jus + also back up files for which any status information has + changed). @xref{after}. + ++@opsummary{no-acl} ++@item --no-acls ++Causes @command{tar} not to store and not to extract ACL's. @xref{Attributes}. ++ + @opsummary{no-anchored} + @item --no-anchored + An exclude pattern can match any subsequence of the name's components. +@@ -2998,11 +3006,21 @@ locations. Usually @command{tar} determ + the archive can be seeked or not. Use this option to disable this + mechanism. + ++@opsummary{no-selinux} ++@item --no-selinux ++Causes @command{tar} not to store and not to extract SELinux security context. ++@xref{Attributes}. ++ + @opsummary{no-unquote} + @item --no-unquote + Treat all input file or member names literally, do not interpret + escape sequences. @xref{input name quoting}. + ++@opsummary{no-xattrs} ++@item --no-xattrs ++Causes @command{tar} not to store and not to extract xattrs. This option also ++enables @option{--no-selinux} and @option{--no-acls}. @xref{Attributes}. ++ + @opsummary{no-wildcards} + @item --no-wildcards + Do not use wildcards. +@@ -3235,6 +3253,11 @@ in cases when such recognition fails. I + archive is open for reading (e.g. with @option{--list} or + @option{--extract} options). + ++@opsummary{selinux} ++@item --selinux ++Causes @command{tar} to store SElinux security context. @xref{Attributes}. ++ ++ + @opsummary{show-defaults} + @item --show-defaults + +@@ -3448,6 +3471,11 @@ Enable or disable warning messages ident + messages are suppressed if @var{keyword} is prefixed with @samp{no-}. + @xref{warnings}. + ++@opsummary{xattrs} ++@item --xattrs ++Causes @command{tar} to store xattrs. This option also enables ++@option{--selinux} and @option{--acls}. @xref{Attributes}. ++ + @opsummary{wildcards} + @item --wildcards + Use wildcards when matching member names with patterns. +@@ -8643,6 +8671,8 @@ implementation able to read @samp{ustar} + most @samp{posix} archives as well, with the only exception that any + additional information (such as long file names etc.) will in such + case be extracted as plain text files along with the files it refers to. ++This is the only format that can store ACLs, SELinux context and extended ++attributes. + + This archive format will be the default format for future versions + of @GNUTAR{}. +@@ -9259,6 +9289,51 @@ Same as both @option{--same-permissions} + + This option is deprecated, and will be removed in @GNUTAR{} version 1.23. + ++@opindex acls ++@item --acls ++This option causes @command{tar} to store the current ACL in the archive. ++ ++The @option{--acls} option has no equivalent short option name. ++ ++@opindex selinux ++@item --selinux ++This option causes @command{tar} to store the current SELinux security context ++information in the archive. ++ ++The @option{--selinux} option has no equivalent short option name. ++ ++@opindex xattrs ++@item --xattrs ++This option causes @command{tar} to store the current extended attributes in ++the archive. This option also enables @option{--acls} and @option{--selinux} if ++they haven't been set already. ++ ++The @option{--xattrs} option has no equivalent short option name. ++ ++@opindex no-acls ++@item --no-acls ++This option causes @command{tar} not to store the current ACL in the archive ++and not to extract any ACL information in an archive. ++ ++The @option{--no-acls} option has no equivalent short option name. ++ ++@opindex no-selinux ++@item --no-selinux ++This option causes @command{tar} not to store the current SELinux security ++context information in the archive and not to extract any SELinux information in ++an archive. ++ ++The @option{--no-selinux} option has no equivalent short option name. ++ ++@opindex no-xattrs ++@item --no-xattrs ++This option causes @command{tar} not to store the current extended attributes in ++the archive and not to extract any extended attributes in an archive. This ++option also enables @option{--no-acls} and @option{--no-selinux} if ++they haven't been set already. ++ ++The @option{--no-xattrs} option has no equivalent short option name. ++ + @end table + + @node Portability +diff -urNp tar-1.24-orig/src/common.h tar-1.24/src/common.h +--- tar-1.24-orig/src/common.h 2010-10-24 20:07:54.000000000 +0200 ++++ tar-1.24/src/common.h 2010-10-25 10:24:52.558475456 +0200 +@@ -253,6 +253,15 @@ GLOBAL int same_owner_option; + /* If positive, preserve permissions when extracting. */ + GLOBAL int same_permissions_option; + ++/* If positive, save the SELinux context. */ ++GLOBAL int selinux_context_option; ++ ++/* If positive, save the ACLs. */ ++GLOBAL int acls_option; ++ ++/* If positive, save the user and root xattrs. */ ++GLOBAL int xattrs_option; ++ + /* When set, strip the given number of file name components from the file name + before extracting */ + GLOBAL size_t strip_name_components; +@@ -706,6 +715,9 @@ extern char *output_start; + + void update_archive (void); + ++/* Module attrs.c. */ ++#include "xattrs.h" ++ + /* Module xheader.c. */ + + void xheader_decode (struct tar_stat_info *stat); +@@ -726,6 +738,12 @@ bool xheader_string_end (struct xheader + bool xheader_keyword_deleted_p (const char *kw); + char *xheader_format_name (struct tar_stat_info *st, const char *fmt, + size_t n); ++void xheader_xattr_init(struct tar_stat_info *st); ++void xheader_xattr_free(struct xattr_array *vals, size_t sz); ++void xheader_xattr_copy(const struct tar_stat_info *st, ++ struct xattr_array **vals, size_t *sz); ++void xheader_xattr_add(struct tar_stat_info *st, ++ const char *key, const char *val, size_t len); + + /* Module system.c */ + +diff -urNp tar-1.24-orig/src/create.c tar-1.24/src/create.c +--- tar-1.24-orig/src/create.c 2010-10-24 20:07:54.000000000 +0200 ++++ tar-1.24/src/create.c 2010-10-25 10:24:52.560213618 +0200 +@@ -24,6 +24,7 @@ + #include <quotearg.h> + + #include "common.h" ++ + #include <hash.h> + + /* Error number to use when an impostor is discovered. +@@ -934,6 +935,30 @@ start_header (struct tar_stat_info *st) + GNAME_TO_CHARS (st->gname, header->header.gname); + } + ++ if (archive_format == POSIX_FORMAT) ++ { ++ if (acls_option > 0) ++ { ++ if (st->acls_a_ptr) ++ xheader_store ("SCHILY.acl.access", st, NULL); ++ if (st->acls_d_ptr) ++ xheader_store ("SCHILY.acl.default", st, NULL); ++ } ++ if ((selinux_context_option > 0) && st->cntx_name) ++ xheader_store ("RHT.security.selinux", st, NULL); ++ if (xattrs_option > 0) ++ { ++ size_t scan_xattr = 0; ++ struct xattr_array *xattr_map = st->xattr_map; ++ ++ while (scan_xattr < st->xattr_map_size) ++ { ++ xheader_store (xattr_map[scan_xattr].xkey, st, &scan_xattr); ++ ++scan_xattr; ++ } ++ } ++ } ++ + return header; + } + +@@ -1709,6 +1734,10 @@ dump_file0 (struct tar_stat_info *st, ch + bool ok; + struct stat final_stat; + ++ xattrs_acls_get(st, p, fd, !is_dir); ++ xattrs_selinux_get(st, p, fd); ++ xattrs_xattrs_get(st, p, fd); ++ + if (is_dir) + { + const char *tag_file_name; +@@ -1826,6 +1855,9 @@ dump_file0 (struct tar_stat_info *st, ch + if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) < size) + write_long_link (st); + ++ xattrs_selinux_get(st, p, -1); ++ xattrs_xattrs_get(st, p, -1); ++ + block_ordinal = current_block_ordinal (); + st->stat.st_size = 0; /* force 0 size on symlink */ + header = start_header (st); +@@ -1844,11 +1876,23 @@ dump_file0 (struct tar_stat_info *st, ch + } + #endif + else if (S_ISCHR (st->stat.st_mode)) +- type = CHRTYPE; ++ { ++ type = CHRTYPE; ++ xattrs_selinux_get(st, p, -1); ++ xattrs_xattrs_get(st, p, -1); ++ } + else if (S_ISBLK (st->stat.st_mode)) +- type = BLKTYPE; ++ { ++ type = BLKTYPE; ++ xattrs_selinux_get(st, p, -1); ++ xattrs_xattrs_get(st, p, -1); ++ } + else if (S_ISFIFO (st->stat.st_mode)) +- type = FIFOTYPE; ++ { ++ type = FIFOTYPE; ++ xattrs_selinux_get(st, p, -1); ++ xattrs_xattrs_get(st, p, -1); ++ } + else if (S_ISSOCK (st->stat.st_mode)) + { + WARNOPT (WARN_FILE_IGNORED, +diff -urNp tar-1.24-orig/src/extract.c tar-1.24/src/extract.c +--- tar-1.24-orig/src/extract.c 2010-10-24 20:07:54.000000000 +0200 ++++ tar-1.24/src/extract.c 2010-10-25 10:35:10.903214037 +0200 +@@ -97,6 +97,14 @@ struct delayed_set_stat + /* Directory that the name is relative to. */ + int change_dir; + ++ /* extended attributes*/ ++ char *cntx_name; ++ char *acls_a_ptr; ++ size_t acls_a_len; ++ char *acls_d_ptr; ++ size_t acls_d_len; ++ size_t xattr_map_size; /* Size of the xattr map */ ++ struct xattr_array *xattr_map; + /* Length and contents of name. */ + size_t file_name_len; + char file_name[1]; +@@ -134,6 +142,18 @@ struct delayed_link + hard-linked together. */ + struct string_list *sources; + ++ /* SELinux context */ ++ char *cntx_name; ++ ++ /* ACLs */ ++ char *acls_a_ptr; ++ size_t acls_a_len; ++ char *acls_d_ptr; ++ size_t acls_d_len; ++ ++ size_t xattr_map_size; /* Size of the xattr map */ ++ struct xattr_array *xattr_map; ++ + /* The desired target of the desired link. */ + char target[1]; + }; +@@ -335,6 +355,10 @@ set_stat (char const *file_name, + utime_error (file_name); + } + ++ xattrs_acls_set(st, file_name, typeflag); ++ xattrs_selinux_set(st, file_name, typeflag); ++ xattrs_xattrs_set(st, file_name, typeflag); ++ + if (0 < same_owner_option && ! interdir) + { + /* Some systems allow non-root users to give files away. Once this +@@ -431,6 +455,36 @@ delay_set_stat (char const *file_name, s + data->atflag = atflag; + data->after_links = 0; + data->change_dir = chdir_current; ++ data->cntx_name = NULL; ++ if (st) ++ assign_string (&data->cntx_name, st->cntx_name); ++ if (st && st->acls_a_ptr) ++ { ++ data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1); ++ data->acls_a_len = st->acls_a_len; ++ } ++ else ++ { ++ data->acls_a_ptr = NULL; ++ data->acls_a_len = 0; ++ } ++ if (st && st->acls_d_ptr) ++ { ++ data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1); ++ data->acls_d_len = st->acls_d_len; ++ } ++ else ++ { ++ data->acls_d_ptr = NULL; ++ data->acls_d_len = 0; ++ } ++ if (st) ++ xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size); ++ else ++ { ++ data->xattr_map = NULL; ++ data->xattr_map_size = 0; ++ } + strcpy (data->file_name, file_name); + delayed_set_stat_head = data; + if (must_be_dot_or_slash (file_name)) +@@ -661,6 +708,31 @@ maybe_recoverable (char *file_name, bool + return RECOVER_NO; + } + ++/* Restore stat extended attributes (xattr) for FILE_NAME, using information ++ given in *ST. Restore before extraction because they may affect layout. ++ If not restoring permissions, invert the ++ INVERT_PERMISSIONS bits from the file's current permissions. ++ TYPEFLAG specifies the type of the file. ++ FILE_CREATED indicates set_xattr has created the file */ ++static int ++set_xattr (char const *file_name, struct tar_stat_info const *st, ++ mode_t invert_permissions, char typeflag, int *file_created) ++{ ++ int status = 0; ++ bool interdir_made = false; ++ ++ if ((xattrs_option >= 0) && st->xattr_map_size) { ++ mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask; ++ ++ do ++ status = mknod (file_name, mode ^ invert_permissions, 0); ++ while (status && maybe_recoverable ((char *)file_name, false, &interdir_made)); ++ xattrs_xattrs_set(st, file_name, typeflag); ++ *file_created = 1; ++ } ++ return(status); ++} ++ + /* Fix the statuses of all directories whose statuses need fixing, and + which are not ancestors of FILE_NAME. If AFTER_LINKS is + nonzero, do this for all such directories; otherwise, stop at the +@@ -721,12 +793,23 @@ apply_nonancestor_delayed_set_stat (char + sb.stat.st_gid = data->gid; + sb.atime = data->atime; + sb.mtime = data->mtime; ++ sb.cntx_name = data->cntx_name; ++ sb.acls_a_ptr = data->acls_a_ptr; ++ sb.acls_a_len = data->acls_a_len; ++ sb.acls_d_ptr = data->acls_d_ptr; ++ sb.acls_d_len = data->acls_d_len; ++ sb.xattr_map = data->xattr_map; ++ sb.xattr_map_size = data->xattr_map_size; + set_stat (data->file_name, &sb, + -1, current_mode, current_mode_mask, + DIRTYPE, data->interdir, data->atflag); + } + + delayed_set_stat_head = data->next; ++ xheader_xattr_free (data->xattr_map, data->xattr_map_size); ++ free (data->cntx_name); ++ free (data->acls_a_ptr); ++ free (data->acls_d_ptr); + free (data); + } + } +@@ -842,6 +925,7 @@ extract_dir (char *file_name, int typefl + + static int + open_output_file (char const *file_name, int typeflag, mode_t mode, ++ int file_created, + mode_t *current_mode, mode_t *current_mode_mask) + { + int fd; +@@ -852,6 +936,10 @@ open_output_file (char const *file_name, + ? O_TRUNC | (dereference_option ? 0 : O_NOFOLLOW) + : O_EXCL)); + ++ /* File might be created in set_xattr. So clear O_EXCL to avoid open() failure */ ++ if (file_created) ++ openflag = openflag & ~O_EXCL; ++ + if (typeflag == CONTTYPE) + { + static int conttype_diagnosed; +@@ -908,6 +996,7 @@ extract_file (char *file_name, int typef + bool interdir_made = false; + mode_t mode = (current_stat_info.stat.st_mode & MODE_RWX + & ~ (0 < same_owner_option ? S_IRWXG | S_IRWXO : 0)); ++ mode_t invert_permissions = 0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0; + mode_t current_mode = 0; + mode_t current_mode_mask = 0; + +@@ -924,7 +1013,17 @@ extract_file (char *file_name, int typef + } + else + { ++ int file_created = 0; ++ if (set_xattr (file_name, &current_stat_info, invert_permissions, ++ typeflag, &file_created)) ++ { ++ skip_member (); ++ open_error (file_name); ++ return 1; ++ } ++ + while ((fd = open_output_file (file_name, typeflag, mode, ++ file_created, + &current_mode, &current_mode_mask)) + < 0) + { +@@ -1065,6 +1164,13 @@ create_placeholder_file (char *file_name + + strlen (file_name) + 1); + p->sources->next = 0; + strcpy (p->sources->string, file_name); ++ p->cntx_name = NULL; ++ assign_string (&p->cntx_name, current_stat_info.cntx_name); ++ p->acls_a_ptr = NULL; ++ p->acls_a_len = 0; ++ p->acls_d_ptr = NULL; ++ p->acls_d_len = 0; ++ xheader_xattr_copy (&current_stat_info, &p->xattr_map, &p->xattr_map_size); + strcpy (p->target, current_stat_info.link_name); + + h = delayed_set_stat_head; +@@ -1499,6 +1605,13 @@ apply_delayed_links (void) + st1.stat.st_gid = ds->gid; + st1.atime = ds->atime; + st1.mtime = ds->mtime; ++ st1.cntx_name = ds->cntx_name; ++ st1.acls_a_ptr = ds->acls_a_ptr; ++ st1.acls_a_len = ds->acls_a_len; ++ st1.acls_d_ptr = ds->acls_d_ptr; ++ st1.acls_d_len = ds->acls_d_len; ++ st1.xattr_map = ds->xattr_map; ++ st1.xattr_map_size = ds->xattr_map_size; + set_stat (source, &st1, -1, 0, 0, SYMTYPE, + false, AT_SYMLINK_NOFOLLOW); + valid_source = source; +@@ -1513,6 +1626,9 @@ apply_delayed_links (void) + sources = next; + } + ++ xheader_xattr_free (ds->xattr_map, ds->xattr_map_size); ++ free (ds->cntx_name); ++ + { + struct delayed_link *next = ds->next; + free (ds); +diff -urNp tar-1.24-orig/src/list.c tar-1.24/src/list.c +--- tar-1.24-orig/src/list.c 2010-10-25 09:15:14.216463863 +0200 ++++ tar-1.24/src/list.c 2010-10-25 10:24:52.563213968 +0200 +@@ -597,6 +597,13 @@ decode_header (union block *header, stru + assign_string (&stat_info->gname, + header->header.gname[0] ? header->header.gname : NULL); + ++ stat_info->acls_a_ptr = NULL; ++ stat_info->acls_a_len = 0; ++ stat_info->acls_d_ptr = NULL; ++ stat_info->acls_d_len = 0; ++ stat_info->cntx_name = NULL; ++ xheader_xattr_init(stat_info); ++ + if (format == OLDGNU_FORMAT && incremental_option) + { + stat_info->atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime); +diff -urNp tar-1.24-orig/src/Makefile.am tar-1.24/src/Makefile.am +--- tar-1.24-orig/src/Makefile.am 2010-10-24 20:07:54.000000000 +0200 ++++ tar-1.24/src/Makefile.am 2010-10-25 10:24:52.564214456 +0200 +@@ -20,7 +20,7 @@ + + bin_PROGRAMS = tar + +-noinst_HEADERS = arith.h common.h tar.h ++noinst_HEADERS = arith.h common.h tar.h xattrs.h + tar_SOURCES = \ + buffer.c\ + checkpoint.c\ +@@ -42,10 +42,11 @@ tar_SOURCES = \ + unlink.c\ + update.c\ + utf8.c\ +- warning.c ++ warning.c\ ++ xattrs.c + + INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib + + LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV) + +-tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) ++tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) +diff -urNp tar-1.24-orig/src/tar.c tar-1.24/src/tar.c +--- tar-1.24-orig/src/tar.c 2010-10-24 20:07:55.000000000 +0200 ++++ tar-1.24/src/tar.c 2010-10-25 10:24:52.565223676 +0200 +@@ -255,7 +255,8 @@ tar_set_quoting_style (char *arg) + + enum + { +- ANCHORED_OPTION = CHAR_MAX + 1, ++ ACLS_OPTION = CHAR_MAX + 1, ++ ANCHORED_OPTION, + ATIME_PRESERVE_OPTION, + BACKUP_OPTION, + CHECK_DEVICE_OPTION, +@@ -288,6 +289,7 @@ enum + MODE_OPTION, + MTIME_OPTION, + NEWER_MTIME_OPTION, ++ NO_ACLS_OPTION, + NO_ANCHORED_OPTION, + NO_AUTO_COMPRESS_OPTION, + NO_CHECK_DEVICE_OPTION, +@@ -301,9 +303,11 @@ enum + NO_SAME_OWNER_OPTION, + NO_SAME_PERMISSIONS_OPTION, + NO_SEEK_OPTION, ++ NO_SELINUX_CONTEXT_OPTION, + NO_UNQUOTE_OPTION, + NO_WILDCARDS_MATCH_SLASH_OPTION, + NO_WILDCARDS_OPTION, ++ NO_XATTR_OPTION, + NULL_OPTION, + NUMERIC_OWNER_OPTION, + OCCURRENCE_OPTION, +@@ -325,6 +329,7 @@ enum + RMT_COMMAND_OPTION, + RSH_COMMAND_OPTION, + SAME_OWNER_OPTION, ++ SELINUX_CONTEXT_OPTION, + SHOW_DEFAULTS_OPTION, + SHOW_OMITTED_DIRS_OPTION, + SHOW_TRANSFORMED_NAMES_OPTION, +@@ -340,7 +345,8 @@ enum + VOLNO_FILE_OPTION, + WARNING_OPTION, + WILDCARDS_MATCH_SLASH_OPTION, +- WILDCARDS_OPTION ++ WILDCARDS_OPTION, ++ XATTR_OPTION + }; + + const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION; +@@ -486,6 +492,10 @@ static struct argp_option options[] = { + {NULL, 0, NULL, 0, + N_("Handling of file attributes:"), GRID }, + ++ {"acls", ACLS_OPTION, 0, 0, ++ N_("Save the ACLs to the archive"), GRID+1 }, ++ {"no-acls", NO_ACLS_OPTION, 0, 0, ++ N_("Don't extract the ACLs from the archive"), GRID+1 }, + {"owner", OWNER_OPTION, N_("NAME"), 0, + N_("force NAME as owner for added files"), GRID+1 }, + {"group", GROUP_OPTION, N_("NAME"), 0, +@@ -516,6 +526,14 @@ static struct argp_option options[] = { + {"preserve-order", 's', 0, 0, + N_("sort names to extract to match archive"), GRID+1 }, + {"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, ++ {"selinux", SELINUX_CONTEXT_OPTION, 0, 0, ++ N_("Save the SELinux context to the archive"), GRID+1 }, ++ {"no-selinux", NO_SELINUX_CONTEXT_OPTION, 0, 0, ++ N_("Don't extract the SELinux context from the archive"), GRID+1 }, ++ {"xattrs", XATTR_OPTION, 0, 0, ++ N_("Save the user/root xattrs to the archive"), GRID+1 }, ++ {"no-xattrs", NO_XATTR_OPTION, 0, 0, ++ N_("Don't extract the user/root xattrs from the archive"), GRID+1 }, + {"preserve", PRESERVE_OPTION, 0, 0, + N_("same as both -p and -s"), GRID+1 }, + {"delay-directory-restore", DELAY_DIRECTORY_RESTORE_OPTION, 0, 0, +@@ -2079,6 +2097,37 @@ parse_opt (int key, char *arg, struct ar + same_permissions_option = -1; + break; + ++ case ACLS_OPTION: ++ set_archive_format ("posix"); ++ acls_option = 1; ++ break; ++ ++ case NO_ACLS_OPTION: ++ acls_option = -1; ++ break; ++ ++ case SELINUX_CONTEXT_OPTION: ++ set_archive_format ("posix"); ++ selinux_context_option = 1; ++ break; ++ ++ case NO_SELINUX_CONTEXT_OPTION: ++ selinux_context_option = -1; ++ break; ++ ++ case XATTR_OPTION: ++ set_archive_format ("posix"); ++ if (!acls_option) acls_option = 1; ++ if (!selinux_context_option) selinux_context_option = 1; ++ xattrs_option = 1; ++ break; ++ ++ case NO_XATTR_OPTION: ++ if (!acls_option) acls_option = -1; ++ if (!selinux_context_option) selinux_context_option = -1; ++ xattrs_option = -1; ++ break; ++ + case RECURSION_OPTION: + recursion_option = FNM_LEADING_DIR; + break; +@@ -2461,6 +2510,29 @@ decode_options (int argc, char **argv) + || subcommand_option != LIST_SUBCOMMAND)) + USAGE_ERROR ((0, 0, _("--pax-option can be used only on POSIX archives"))); + ++ /* star create's non-POSIX typed archives with xattr support, so allow the ++ extra headers */ ++ if ((acls_option > 0) ++ && archive_format != POSIX_FORMAT ++ && (subcommand_option != EXTRACT_SUBCOMMAND ++ || subcommand_option != DIFF_SUBCOMMAND ++ || subcommand_option != LIST_SUBCOMMAND)) ++ USAGE_ERROR ((0, 0, _("--acls can be used only on POSIX archives"))); ++ ++ if ((selinux_context_option > 0) ++ && archive_format != POSIX_FORMAT ++ && (subcommand_option != EXTRACT_SUBCOMMAND ++ || subcommand_option != DIFF_SUBCOMMAND ++ || subcommand_option != LIST_SUBCOMMAND)) ++ USAGE_ERROR ((0, 0, _("--selinux can be used only on POSIX archives"))); ++ ++ if ((xattrs_option > 0) ++ && archive_format != POSIX_FORMAT ++ && (subcommand_option != EXTRACT_SUBCOMMAND ++ || subcommand_option != DIFF_SUBCOMMAND ++ || subcommand_option != LIST_SUBCOMMAND)) ++ USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives"))); ++ + /* If ready to unlink hierarchies, so we are for simpler files. */ + if (recursive_unlink_option) + old_files_option = UNLINK_FIRST_OLD_FILES; +@@ -2713,11 +2785,15 @@ void + tar_stat_destroy (struct tar_stat_info *st) + { + tar_stat_close (st); ++ xheader_xattr_free (st->xattr_map, st->xattr_map_size); + free (st->orig_file_name); + free (st->file_name); + free (st->link_name); + free (st->uname); + free (st->gname); ++ free (st->cntx_name); ++ free (st->acls_a_ptr); ++ free (st->acls_d_ptr); + free (st->sparse_map); + free (st->dumpdir); + xheader_destroy (&st->xhdr); +diff -urNp tar-1.24-orig/src/tar.h tar-1.24/src/tar.h +--- tar-1.24-orig/src/tar.h 2010-10-24 20:07:46.000000000 +0200 ++++ tar-1.24/src/tar.h 2010-10-25 10:24:52.567223606 +0200 +@@ -276,6 +276,14 @@ struct xheader + uintmax_t string_length; + }; + ++/* Information about xattrs for a file. */ ++struct xattr_array ++ { ++ char *xkey; ++ char *xval_ptr; ++ size_t xval_len; ++ }; ++ + struct tar_stat_info + { + char *orig_file_name; /* name of file read from the archive header */ +@@ -287,6 +295,15 @@ struct tar_stat_info + + char *uname; /* user name of owner */ + char *gname; /* group name of owner */ ++ ++ char *cntx_name; /* SELinux context for the current archive entry. */ ++ ++ char *acls_a_ptr; /* Access ACLs for the current archive entry. */ ++ size_t acls_a_len; /* Access ACLs for the current archive entry. */ ++ ++ char *acls_d_ptr; /* Default ACLs for the current archive entry. */ ++ size_t acls_d_len; /* Default ACLs for the current archive entry. */ ++ + struct stat stat; /* regular filesystem stat */ + + /* STAT doesn't always have access, data modification, and status +@@ -309,6 +326,9 @@ struct tar_stat_info + size_t sparse_map_size; /* Size of the sparse map */ + struct sp_array *sparse_map; + ++ size_t xattr_map_size; /* Size of the xattr map */ ++ struct xattr_array *xattr_map; ++ + /* Extended headers */ + struct xheader xhdr; + +diff -urNp tar-1.24-orig/src/xattrs.c tar-1.24/src/xattrs.c +--- tar-1.24-orig/src/xattrs.c 1970-01-01 01:00:00.000000000 +0100 ++++ tar-1.24/src/xattrs.c 2010-10-25 10:24:52.568214736 +0200 +@@ -0,0 +1,489 @@ ++/* Create a tar archive. ++ ++ Copyright (C) 2006 Free Software Foundation, Inc. ++ ++ Written by James Antill, on 2006-07-27. ++ ++ This program is free software; you can redistribute it and/or modify it ++ under the terms of the GNU General Public License as published by the ++ Free Software Foundation; either version 2, or (at your option) any later ++ version. ++ ++ This program is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++ Public License for more details. ++ ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ ++ ++#include <system.h> ++ ++#include <quotearg.h> ++ ++#include "common.h" ++ ++ ++#ifndef HAVE_SELINUX_SELINUX_H ++# undef HAVE_LIBSELINUX ++#endif ++ ++#ifndef HAVE_ATTR_XATTR_H ++# undef HAVE_XATTRS ++#endif ++ ++#ifndef HAVE_SYS_ACL_H ++# undef HAVE_LIBACL ++#endif ++ ++#ifdef HAVE_SELINUX_SELINUX_H ++# include <selinux/selinux.h> ++#endif ++ ++#ifdef HAVE_ATTR_XATTR_H ++# include <attr/xattr.h> ++#endif ++ ++#ifdef HAVE_SYS_ACL_H ++# include <sys/acl.h> ++#endif ++ ++ ++#if 0 /* unused by xattr's atm. */ ++static void xattrs__fd_get(struct tar_stat_info *st, ++ char const *file_name, int fd, const char *attr, ++ char **ret_ptr, size_t *ret_len) ++{ ++#ifdef HAVE_XATTRS ++ static ssize_t asz = 1024; ++ ssize_t ret = 0; ++ static char *val = NULL; ++ ++ if (!val) val = xmalloc (asz); ++ ++ while (((ret = fgetxattr (fd, attr, val, asz)) == -1) && ++ (errno == ERANGE)) ++ { ++ asz <<= 1; ++ val = xrealloc (val, asz); ++ } ++ ++ if (ret != -1) ++ { ++ *ret_ptr = xmemdup (val, ret + 1); ++ *ret_len = ret; ++ } ++ else if (errno != ENOATTR) ++ call_arg_warn ("fgetxattr", file_name); ++#endif ++} ++#endif ++ ++static void xattrs__acls_get_a(struct tar_stat_info *st, ++ char const *file_name, int fd, ++ char **ret_ptr, size_t *ret_len) ++{ /* "system.posix_acl_access" */ ++#ifdef HAVE_LIBACL ++ char *val = NULL; ++ ssize_t len; ++ acl_t acl; ++ ++ if (fd != -1) ++ { ++ if ((acl = acl_get_fd (fd)) == (acl_t)NULL) ++ { ++ if (errno != ENOTSUP) ++ call_arg_warn ("acl_get_fd", file_name); ++ return; ++ } ++ } ++ else if ((acl = acl_get_file (file_name, ACL_TYPE_ACCESS)) == (acl_t)NULL) ++ { ++ if (errno != ENOTSUP) ++ call_arg_warn ("acl_get_file", file_name); ++ return; ++ } ++ ++ ++ val = acl_to_text(acl, &len); ++ acl_free (acl); ++ ++ if (val == NULL) ++ { ++ call_arg_warn ("acl_to_text", file_name); ++ return; ++ } ++ ++ *ret_ptr = xstrdup (val); ++ *ret_len = len; ++ ++ acl_free (val); ++#endif ++} ++ ++static void xattrs__acls_get_d(struct tar_stat_info *st, ++ char const *file_name, ++ char **ret_ptr, size_t *ret_len) ++{ /* "system.posix_acl_default" */ ++#ifdef HAVE_LIBACL ++ char *val = NULL; ++ ssize_t len; ++ acl_t acl; ++ ++ if ((acl = acl_get_file (file_name, ACL_TYPE_DEFAULT)) == (acl_t)NULL) ++ { ++ if (errno != ENOTSUP) ++ call_arg_warn ("acl_get_file", file_name); ++ return; ++ } ++ ++ val = acl_to_text(acl, &len); ++ acl_free (acl); ++ ++ if (val == NULL) ++ { ++ call_arg_warn ("acl_to_text", file_name); ++ return; ++ } ++ ++ *ret_ptr = xstrdup (val); ++ *ret_len = len; ++ ++ acl_free (val); ++#endif ++} ++ ++void xattrs_acls_get(struct tar_stat_info *st, char const *file_name, int fd, ++ int xisfile) ++{ ++ if (acls_option > 0) ++ { ++#ifndef HAVE_LIBACL ++ static int done = 0; ++ if (!done) ++ WARN ((0, 0, _("ACL support requested, but not available"))); ++ done = 1; ++#endif ++ xattrs__acls_get_a (st, file_name, fd, ++ &st->acls_a_ptr, &st->acls_a_len); ++ if (!xisfile) ++ xattrs__acls_get_d (st, file_name, ++ &st->acls_d_ptr, &st->acls_d_len); ++ } ++} ++ ++void xattrs_selinux_get(struct tar_stat_info *st, char const *file_name, int fd) ++{ ++ if (selinux_context_option > 0) ++ { ++#ifndef HAVE_LIBSELINUX ++ static int done = 0; ++ if (!done) ++ WARN ((0, 0, _("SELinux support requested, but not available"))); ++ done = 1; ++#else ++ if (fd == -1) ++ { ++ if ((lgetfilecon (file_name, &st->cntx_name) == -1) && (errno != ENOTSUP) && (errno != ENODATA)) ++ call_arg_warn ("lgetfilecon", file_name); ++ } ++ else if ((fgetfilecon (fd, &st->cntx_name) == -1) && (errno != ENOTSUP) && (errno != ENODATA)) ++ call_arg_warn ("fgetfilecon", file_name); ++#endif ++ } ++} ++ ++void xattrs_xattrs_get(struct tar_stat_info *st, char const *file_name, int fd) ++{ ++ if (xattrs_option > 0) ++ { /* get all xattrs ... this include security.* and system.* if ++ available. We filter them here, but we have to filter them ++ in xattrs_xattrs_set() anyway. ++ */ ++ static ssize_t xsz = 1024; ++ static char *xatrs = NULL; ++ ssize_t xret = -1; ++ ++#ifndef HAVE_XATTRS ++ static int done = 0; ++ if ((xattrs_option > 0) && !done) ++ WARN ((0, 0, _("Xattr support requested, but not available"))); ++ done = 1; ++#else ++ ++ if (!xatrs) xatrs = xmalloc (xsz); ++ ++ while (((fd == -1) ? ++ ((xret = llistxattr (file_name, xatrs, xsz)) == -1) : ++ ((xret = flistxattr (fd, xatrs, xsz)) == -1)) && ++ (errno == ERANGE)) ++ { ++ xsz <<= 1; ++ xatrs = xrealloc (xatrs, xsz); ++ } ++ ++ if (xret == -1) ++ call_arg_warn ((fd == -1) ? "llistxattrs" : "flistxattrs", file_name); ++ else ++ { ++ const char *attr = xatrs; ++ static ssize_t asz = 1024; ++ static char *val = NULL; ++ ++ if (!val) val = xmalloc (asz); ++ ++ while (xret > 0) ++ { ++ size_t len = strlen (attr); ++ ssize_t aret = 0; ++ ++ /* Archive all xattrs during creation, decide at extraction time ++ * which ones are of interest/use for the target filesystem. */ ++ while (((fd == -1) ? ++ ((aret = lgetxattr (file_name, attr, val, asz)) == -1) : ++ ((aret = fgetxattr (fd, attr, val, asz)) == -1)) && ++ (errno == ERANGE)) ++ { ++ asz <<= 1; ++ val = xrealloc (val, asz); ++ } ++ ++ if (aret != -1) ++ xheader_xattr_add (st, attr, val, aret); ++ else if (errno != ENOATTR) ++ call_arg_warn ((fd==-1) ? "lgetxattr" : "fgetxattr", file_name); ++ ++ attr += len + 1; ++ xret -= len + 1; ++ } ++ } ++#endif ++ } ++} ++ ++static void xattrs__fd_set(struct tar_stat_info const *st, ++ char const *file_name, char typeflag, ++ const char *attr, ++ const char *ptr, size_t len) ++{ ++#ifdef HAVE_XATTRS ++ if (ptr) ++ { ++ const char *sysname = "setxattr"; ++ int ret = -1; ++ ++ if (typeflag != SYMTYPE) ++ ret = setxattr (file_name, attr, ptr, len, 0); ++ else ++ { ++ sysname = "lsetxattr"; ++ ret = lsetxattr (file_name, attr, ptr, len, 0); ++ } ++ ++ /* do not print warnings when SELinux is disabled */ ++ if ((ret == -1) && (errno != EPERM) && (errno != ENOTSUP)) ++ call_arg_error(sysname, file_name); ++ } ++#endif ++} ++ ++/* convert unix permissions into an ACL ... needed due to "default" ACLs */ ++#ifdef HAVE_LIBACL ++static acl_t perms2acl(int perms) ++{ ++ char val[] = "user::---,group::---,other::---"; ++ /* 0123456789 123456789 123456789 123456789 */ ++ ++ /* user */ ++ if (perms & 0400) val[ 6] = 'r'; ++ if (perms & 0200) val[ 7] = 'w'; ++ if (perms & 0100) val[ 8] = 'x'; ++ ++ /* group */ ++ if (perms & 0040) val[17] = 'r'; ++ if (perms & 0020) val[18] = 'w'; ++ if (perms & 0010) val[19] = 'x'; ++ ++ /* other */ ++ if (perms & 0004) val[28] = 'r'; ++ if (perms & 0002) val[29] = 'w'; ++ if (perms & 0001) val[30] = 'x'; ++ ++ return (acl_from_text (val)); ++} ++#endif ++ ++static char *skip_to_ext_fields(char *ptr) ++{ ++ ptr += strcspn(ptr, ":,\n"); /* skip tag name. Ie. user/group/default/mask */ ++ ++ if (*ptr != ':') ++ return (ptr); /* error? no user/group field */ ++ ++ptr; ++ ++ ptr += strcspn(ptr, ":,\n"); /* skip user/group name */ ++ ++ if (*ptr != ':') ++ return (ptr); /* error? no perms field */ ++ ++ptr; ++ ++ ptr += strcspn(ptr, ":,\n"); /* skip perms */ ++ ++ if (*ptr != ':') ++ return (ptr); /* no extra fields */ ++ ++ return (ptr); ++} ++ ++/* The POSIX draft allows extra fields after the three main ones. Star ++ uses this to add a fourth field for user/group which is the numeric ID. ++ We just skip all extra fields atm. */ ++static const char *fixup_extra_acl_fields(const char *ptr) ++{ ++ char *src = (char *)ptr; ++ char *dst = (char *)ptr; ++ ++ while (*src) ++ { ++ const char *old = src; ++ size_t len = 0; ++ ++ src = skip_to_ext_fields(src); ++ len = src - old; ++ if (old != dst) memmove(dst, old, len); ++ dst += len; ++ ++ if (*src == ':') /* We have extra fields, skip them all */ ++ src += strcspn(src, "\n,"); ++ ++ if ((*src == '\n') || (*src == ',')) ++ *dst++ = *src++; /* also done when dst == src, but that's ok */ ++ } ++ if (src != dst) ++ *dst = 0; ++ ++ return ptr; ++} ++ ++static void xattrs__acls_set(struct tar_stat_info const *st, ++ char const *file_name, int type, ++ const char *ptr, size_t len) ++{ /* "system.posix_acl_access" */ ++#ifdef HAVE_LIBACL ++ acl_t acl; ++ ++ if (ptr) ++ { ++ /* assert (strlen (ptr) == len); */ ++ ptr = fixup_extra_acl_fields(ptr); ++ ++ acl = acl_from_text (ptr); ++ acls_option = 1; ++ } ++ else if (acls_option > 0) ++ acl = perms2acl (st->stat.st_mode); ++ else ++ return; /* don't call acl functions unless we first hit an ACL, or ++ --acls was passed explicitly */ ++ ++ if (acl == (acl_t)NULL) ++ { ++ call_arg_warn ("acl_from_text", file_name); ++ return; ++ } ++ ++ if (acl_set_file (file_name, type, acl) == -1) ++ { ++ if (errno != ENOTSUP) ++ call_arg_warn ("acl_set_file", file_name); ++ } ++ acl_free (acl); ++#endif ++} ++ ++void xattrs_acls_set(struct tar_stat_info const *st, ++ char const *file_name, char typeflag) ++{ ++ if ((acls_option >= 0) && (typeflag != SYMTYPE)) ++ { ++#ifndef HAVE_LIBACL ++ static int done = 0; ++ if (!done) ++ WARN ((0, 0, _("ACL support requested, but not available"))); ++ done = 1; ++#else ++ xattrs__acls_set (st, file_name, ACL_TYPE_ACCESS, ++ st->acls_a_ptr, st->acls_a_len); ++ if ((typeflag == DIRTYPE) || (typeflag == GNUTYPE_DUMPDIR)) ++ xattrs__acls_set (st, file_name, ACL_TYPE_DEFAULT, ++ st->acls_d_ptr, st->acls_d_len); ++#endif ++ } ++} ++ ++void xattrs_selinux_set(struct tar_stat_info const *st, ++ char const *file_name, char typeflag) ++{ ++ if ((selinux_context_option >= 0) && st->cntx_name) ++ { ++ const char *sysname = "setfilecon"; ++ int ret = -1; ++ ++#ifndef HAVE_LIBSELINUX ++ static int done = 0; ++ if (!done) ++ WARN ((0, 0, _("SELinux support requested, but not available"))); ++ done = 1; ++#else ++ if (typeflag != SYMTYPE) ++ ret = setfilecon (file_name, st->cntx_name); ++ else ++ { ++ sysname = "lsetfilecon"; ++ ret = lsetfilecon (file_name, st->cntx_name); ++ } ++ ++ if ((ret == -1) && (errno == EPERM)) ++ call_arg_warn(sysname, file_name); ++ else if ((ret == -1) && (errno != EOPNOTSUPP)) ++ call_arg_error(sysname, file_name); ++#endif ++ } ++} ++ ++void xattrs_xattrs_set(struct tar_stat_info const *st, ++ char const *file_name, char typeflag) ++{ ++ if ((xattrs_option >= 0) && st->xattr_map_size) ++ { ++ size_t scan = 0; ++ ++#ifndef HAVE_XATTRS ++ static int done = 0; ++ if (!done) ++ WARN ((0, 0, _("Xattr support requested, but not available"))); ++ done = 1; ++#else ++ while (scan < st->xattr_map_size) ++ { ++ char *keyword = st->xattr_map[scan].xkey; ++ ++ /* assert (!memcpy (keyword, "SCHILY.xattr.", strlen("SCHILY.xattr."))); */ ++ keyword += strlen("SCHILY.xattr."); ++ ++ if (strncmp (keyword, "user.", strlen("user.")) && ++ strncmp (keyword, "lustre.", strlen("lustre.")) && ++ strncmp (keyword, "trusted.", strlen("trusted.")) && ++ strncmp (keyword, "security.NTACL", strlen("security.NTACL"))) ++ continue; /* don't try and set anything but normal xattrs */ ++ ++ xattrs__fd_set (st, file_name, typeflag, keyword, ++ st->xattr_map[scan].xval_ptr, ++ st->xattr_map[scan].xval_len); ++ ++ ++scan; ++ } ++#endif ++ } ++} +diff -urNp tar-1.24-orig/src/xattrs.h tar-1.24/src/xattrs.h +--- tar-1.24-orig/src/xattrs.h 1970-01-01 01:00:00.000000000 +0100 ++++ tar-1.24/src/xattrs.h 2010-10-25 10:24:52.569214526 +0200 +@@ -0,0 +1,14 @@ ++ ++extern void xattrs_acls_get(struct tar_stat_info *st, ++ char const *file_name, int fd, int xisfile); ++extern void xattrs_selinux_get(struct tar_stat_info *st, ++ char const *file_name, int fd); ++extern void xattrs_xattrs_get(struct tar_stat_info *st, ++ char const *file_name, int fd); ++ ++extern void xattrs_acls_set(struct tar_stat_info const *st, ++ char const *file_name, char typeflag); ++extern void xattrs_selinux_set(struct tar_stat_info const *st, ++ char const *file_name, char typeflag); ++extern void xattrs_xattrs_set(struct tar_stat_info const *st, ++ char const *file_name, char typeflag); +diff -urNp tar-1.24-orig/src/xheader.c tar-1.24/src/xheader.c +--- tar-1.24-orig/src/xheader.c 2010-10-24 20:07:46.000000000 +0200 ++++ tar-1.24/src/xheader.c 2010-10-25 10:24:52.570223396 +0200 +@@ -460,6 +460,74 @@ xheader_write_global (struct xheader *xh + } + } + ++void xheader_xattr_init(struct tar_stat_info *st) ++{ ++ st->xattr_map = NULL; ++ st->xattr_map_size = 0; ++} ++ ++void xheader_xattr_free(struct xattr_array *xattr_map, size_t xattr_map_size) ++{ ++ size_t scan = 0; ++ ++ while (scan < xattr_map_size) ++ { ++ free (xattr_map[scan].xkey); ++ free (xattr_map[scan].xval_ptr); ++ ++ ++scan; ++ } ++ free (xattr_map); ++} ++ ++static void xheader_xattr__add(struct xattr_array **xattr_map, ++ size_t *xattr_map_size, ++ const char *key, const char *val, size_t len) ++{ ++ size_t pos = (*xattr_map_size)++; ++ ++ *xattr_map = xrealloc (*xattr_map, ++ *xattr_map_size * sizeof(struct xattr_array)); ++ (*xattr_map)[pos].xkey = xstrdup (key); ++ (*xattr_map)[pos].xval_ptr = xmemdup (val, len + 1); ++ (*xattr_map)[pos].xval_len = len; ++} ++ ++void xheader_xattr_add(struct tar_stat_info *st, ++ const char *key, const char *val, size_t len) ++{ ++ size_t klen = strlen (key); ++ char *xkey = xmalloc (strlen("SCHILY.xattr.") + klen + 1); ++ char *tmp = xkey; ++ ++ tmp = stpcpy (tmp, "SCHILY.xattr."); ++ tmp = stpcpy (tmp, key); ++ ++ xheader_xattr__add (&st->xattr_map, &st->xattr_map_size, xkey, val, len); ++ ++ free (xkey); ++} ++ ++void xheader_xattr_copy(const struct tar_stat_info *st, ++ struct xattr_array **xattr_map, size_t *xattr_map_size) ++{ ++ size_t scan = 0; ++ ++ *xattr_map = NULL; ++ *xattr_map_size = 0; ++ ++ while (scan < st->xattr_map_size) ++ { ++ char *key = st->xattr_map[scan].xkey; ++ char *val = st->xattr_map[scan].xval_ptr; ++ size_t len = st->xattr_map[scan].xval_len; ++ ++ xheader_xattr__add(xattr_map, xattr_map_size, key, val, len); ++ ++ ++scan; ++ } ++} ++ + + /* General Interface */ + +@@ -473,6 +541,7 @@ struct xhdr_tab + struct xheader *, void const *data); + void (*decoder) (struct tar_stat_info *, char const *, char const *, size_t); + int flags; ++ bool prefix; + }; + + /* This declaration must be extern, because ISO C99 section 6.9.2 +@@ -489,8 +558,17 @@ locate_handler (char const *keyword) + struct xhdr_tab const *p; + + for (p = xhdr_tab; p->keyword; p++) +- if (strcmp (p->keyword, keyword) == 0) +- return p; ++ if (p->prefix) ++ { ++ if (strncmp (p->keyword, keyword, strlen(p->keyword)) == 0) ++ return p; ++ } ++ else ++ { ++ if (strcmp (p->keyword, keyword) == 0) ++ return p; ++ } ++ + return NULL; + } + +@@ -500,7 +578,7 @@ xheader_protected_pattern_p (const char + struct xhdr_tab const *p; + + for (p = xhdr_tab; p->keyword; p++) +- if ((p->flags & XHDR_PROTECTED) && fnmatch (pattern, p->keyword, 0) == 0) ++ if (!p->prefix && (p->flags & XHDR_PROTECTED) && fnmatch (pattern, p->keyword, 0) == 0) + return true; + return false; + } +@@ -511,7 +589,7 @@ xheader_protected_keyword_p (const char + struct xhdr_tab const *p; + + for (p = xhdr_tab; p->keyword; p++) +- if ((p->flags & XHDR_PROTECTED) && strcmp (p->keyword, keyword) == 0) ++ if (!p->prefix && (p->flags & XHDR_PROTECTED) && strcmp (p->keyword, keyword) == 0) + return true; + return false; + } +@@ -1470,6 +1548,71 @@ volume_filename_decoder (struct tar_stat + } + + static void ++xattr_selinux_coder (struct tar_stat_info const *st, char const *keyword, ++ struct xheader *xhdr, void const *data) ++{ ++ code_string (st->cntx_name, keyword, xhdr); ++} ++ ++static void ++xattr_selinux_decoder (struct tar_stat_info *st, ++ char const *keyword, char const *arg, size_t size) ++{ ++ decode_string (&st->cntx_name, arg); ++} ++ ++static void ++xattr_acls_a_coder (struct tar_stat_info const *st , char const *keyword, ++ struct xheader *xhdr, void const *data) ++{ ++ xheader_print_n (xhdr, keyword, st->acls_a_ptr, st->acls_a_len); ++} ++ ++static void ++xattr_acls_a_decoder (struct tar_stat_info *st, ++ char const *keyword, char const *arg, size_t size) ++{ ++ st->acls_a_ptr = xmemdup (arg, size + 1); ++ st->acls_a_len = size; ++} ++ ++static void ++xattr_acls_d_coder (struct tar_stat_info const *st , char const *keyword, ++ struct xheader *xhdr, void const *data) ++{ ++ xheader_print_n (xhdr, keyword, st->acls_d_ptr, st->acls_d_len); ++} ++ ++static void ++xattr_acls_d_decoder (struct tar_stat_info *st, ++ char const *keyword, char const *arg, size_t size) ++{ ++ st->acls_d_ptr = xmemdup (arg, size + 1); ++ st->acls_d_len = size; ++} ++ ++static void ++xattr_coder (struct tar_stat_info const *st , char const *keyword, ++ struct xheader *xhdr, void const *data) ++{ ++ struct xattr_array *xattr_map = st->xattr_map; ++ const size_t *off = data; ++ xheader_print_n (xhdr, keyword, ++ xattr_map[*off].xval_ptr, xattr_map[*off].xval_len); ++} ++ ++static void ++xattr_decoder (struct tar_stat_info *st, ++ char const *keyword, char const *arg, size_t size) ++{ ++ char *xstr = NULL; ++ ++ xstr = xmemdup(arg, size + 1); ++ xheader_xattr_add(st, keyword + strlen("SCHILY.xattr."), xstr, size); ++ free(xstr); ++} ++ ++static void + sparse_major_coder (struct tar_stat_info const *st, char const *keyword, + struct xheader *xhdr, void const *data) + { +@@ -1506,53 +1649,53 @@ sparse_minor_decoder (struct tar_stat_in + } + + struct xhdr_tab const xhdr_tab[] = { +- { "atime", atime_coder, atime_decoder, 0 }, +- { "comment", dummy_coder, dummy_decoder, 0 }, +- { "charset", dummy_coder, dummy_decoder, 0 }, +- { "ctime", ctime_coder, ctime_decoder, 0 }, +- { "gid", gid_coder, gid_decoder, 0 }, +- { "gname", gname_coder, gname_decoder, 0 }, +- { "linkpath", linkpath_coder, linkpath_decoder, 0 }, +- { "mtime", mtime_coder, mtime_decoder, 0 }, +- { "path", path_coder, path_decoder, 0 }, +- { "size", size_coder, size_decoder, 0 }, +- { "uid", uid_coder, uid_decoder, 0 }, +- { "uname", uname_coder, uname_decoder, 0 }, ++ { "atime", atime_coder, atime_decoder, 0, false }, ++ { "comment", dummy_coder, dummy_decoder, 0, false }, ++ { "charset", dummy_coder, dummy_decoder, 0, false }, ++ { "ctime", ctime_coder, ctime_decoder, 0, false }, ++ { "gid", gid_coder, gid_decoder, 0, false }, ++ { "gname", gname_coder, gname_decoder, 0, false }, ++ { "linkpath", linkpath_coder, linkpath_decoder, 0, false }, ++ { "mtime", mtime_coder, mtime_decoder, 0, false }, ++ { "path", path_coder, path_decoder, 0, false }, ++ { "size", size_coder, size_decoder, 0, false }, ++ { "uid", uid_coder, uid_decoder, 0, false }, ++ { "uname", uname_coder, uname_decoder, 0, false }, + + /* Sparse file handling */ + { "GNU.sparse.name", path_coder, path_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + { "GNU.sparse.major", sparse_major_coder, sparse_major_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + { "GNU.sparse.minor", sparse_minor_coder, sparse_minor_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + { "GNU.sparse.realsize", sparse_size_coder, sparse_size_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + { "GNU.sparse.numblocks", sparse_numblocks_coder, sparse_numblocks_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + + /* tar 1.14 - 1.15.90 keywords. */ + { "GNU.sparse.size", sparse_size_coder, sparse_size_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + /* tar 1.14 - 1.15.1 keywords. Multiple instances of these appeared in 'x' + headers, and each of them was meaningful. It confilcted with POSIX specs, + which requires that "when extended header records conflict, the last one + given in the header shall take precedence." */ + { "GNU.sparse.offset", sparse_offset_coder, sparse_offset_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + { "GNU.sparse.numbytes", sparse_numbytes_coder, sparse_numbytes_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + /* tar 1.15.90 keyword, introduced to remove the above-mentioned conflict. */ + { "GNU.sparse.map", NULL /* Unused, see pax_dump_header() */, +- sparse_map_decoder, 0 }, ++ sparse_map_decoder, 0, false }, + + { "GNU.dumpdir", dumpdir_coder, dumpdir_decoder, +- XHDR_PROTECTED }, ++ XHDR_PROTECTED, false }, + + /* Keeps the tape/volume label. May be present only in the global headers. + Equivalent to GNUTYPE_VOLHDR. */ + { "GNU.volume.label", volume_label_coder, volume_label_decoder, +- XHDR_PROTECTED | XHDR_GLOBAL }, ++ XHDR_PROTECTED | XHDR_GLOBAL, false }, + + /* These may be present in a first global header of the archive. + They provide the same functionality as GNUTYPE_MULTIVOL header. +@@ -1561,11 +1704,41 @@ struct xhdr_tab const xhdr_tab[] = { + GNU.volume.offset keeps the offset of the start of this volume, + otherwise kept in oldgnu_header.offset. */ + { "GNU.volume.filename", volume_label_coder, volume_filename_decoder, +- XHDR_PROTECTED | XHDR_GLOBAL }, ++ XHDR_PROTECTED | XHDR_GLOBAL, false }, + { "GNU.volume.size", volume_size_coder, volume_size_decoder, +- XHDR_PROTECTED | XHDR_GLOBAL }, ++ XHDR_PROTECTED | XHDR_GLOBAL, false }, + { "GNU.volume.offset", volume_offset_coder, volume_offset_decoder, +- XHDR_PROTECTED | XHDR_GLOBAL }, ++ XHDR_PROTECTED | XHDR_GLOBAL, false }, ++ ++ /* We get the SELinux value from filecon, so add a namespace for SELinux ++ instead of storing it in SCHILY.xattr.* (which would be RAW). */ ++ { "RHT.security.selinux", ++ xattr_selinux_coder, xattr_selinux_decoder, 0, false }, ++ ++ /* ACLs, use the star format... */ ++ { "SCHILY.acl.access", ++ xattr_acls_a_coder, xattr_acls_a_decoder, 0, false }, ++ ++ { "SCHILY.acl.default", ++ xattr_acls_d_coder, xattr_acls_d_decoder, 0, false }, ++ ++ /* FIXME: These are compat. for FC-6 ... we shipped a tar using the generic ++ header names by accident. */ ++ { "SCHILY.xattr.security.selinux", ++ xattr_selinux_coder, xattr_selinux_decoder, 0, false }, ++ { "SCHILY.xattr.system.posix_acl_access", ++ xattr_acls_a_coder, xattr_acls_a_decoder, 0, false }, ++ { "SCHILY.xattr.system.posix_acl_default", ++ xattr_acls_d_coder, xattr_acls_d_decoder, 0, false }, ++ ++ /* xattrs use the star format. note we only save some variants... */ ++ { "SCHILY.xattr.user", xattr_coder, xattr_decoder, 0, true }, ++ { "SCHILY.xattr.trusted", xattr_coder, xattr_decoder, 0, true }, ++ { "SCHILY.xattr.lustre", xattr_coder, xattr_decoder, 0, true }, ++ { "SCHILY.xattr.security.NTACL", xattr_coder, xattr_decoder, 0, true }, ++ ++ /* ignore everything else in the xattr namespaces... */ ++ { "SCHILY.xattr", dummy_coder, dummy_decoder, 0, true }, + +- { NULL, NULL, NULL, 0 } ++ { NULL, NULL, NULL, 0, false } + }; diff --git a/pkgs/core/tar/patches/tar-1.25-listedincremental.patch b/pkgs/core/tar/patches/tar-1.25-listedincremental.patch new file mode 100644 index 0000000..940d0ba --- /dev/null +++ b/pkgs/core/tar/patches/tar-1.25-listedincremental.patch @@ -0,0 +1,219 @@ +From 065cf0958c39600f2062cbeeb5b76929d03c207b Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert(a)cs.ucla.edu> +Date: Mon, 22 Nov 2010 22:50:58 -0800 +Subject: [PATCH] * src/names.c: tar: fix bug with --one-file-system --listed-incremental + +Problem (and idea for fix) reported by Martin Weigel +<http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00071.html>. +* src/common.h (is_individual_file): Remove decl. +* src/create.c (dump_file0): Replace "is_individual_file (p)" +with "top_level". +* src/incremen.c (procdir): Replace "!is_individual_file +(name_buffer)" with "st->parent". Fix bug with --one-file-system +and --listed-incremental. +* src/names.c (individual_file_table, register_individual_file): +(is_individual_file): Remove. All uses removed. +--- + src/common.h | 1 - + src/create.c | 4 ++-- + src/incremen.c | 8 ++------ + src/names.c | 26 -------------------------- + 4 files changed, 4 insertions(+), 35 deletions(-) + +diff --git a/src/common.h b/src/common.h +index 35e056e..9444fd7 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -680,7 +680,6 @@ bool excluded_name (char const *name); + + void add_avoided_name (char const *name); + bool is_avoided_name (char const *name); +-bool is_individual_file (char const *name); + + bool contains_dot_dot (char const *name); + +diff --git a/src/create.c b/src/create.c +index a1e90a3..e8de6b9 100644 +--- a/src/create.c ++++ b/src/create.c +@@ -1678,9 +1678,9 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p) + put in the archive. + + This check is omitted if incremental_option is set *and* the +- requested file is not explicitely listed in the command line. */ ++ requested file is not explicitly listed in the command line. */ + +- if (!(incremental_option && !is_individual_file (p)) ++ if (! (incremental_option && ! top_level) + && !S_ISDIR (st->stat.st_mode) + && OLDER_TAR_STAT_TIME (*st, m) + && (!after_date_option || OLDER_TAR_STAT_TIME (*st, c))) +diff --git a/src/incremen.c b/src/incremen.c +index 628ff29..2b33c5d 100644 +--- a/src/incremen.c ++++ b/src/incremen.c +@@ -426,7 +426,6 @@ procdir (const char *name_buffer, struct tar_stat_info *st, + { + struct directory *directory; + struct stat *stat_data = &st->stat; +- dev_t device = st->parent ? st->parent->stat.st_dev : 0; + bool nfs = NFS_FILE_STAT (*stat_data); + + if ((directory = find_directory (name_buffer)) != NULL) +@@ -540,11 +539,8 @@ procdir (const char *name_buffer, struct tar_stat_info *st, + } + } + +- /* If the directory is on another device and --one-file-system was given, +- omit it... */ +- if (one_file_system_option && device != stat_data->st_dev +- /* ... except if it was explicitely given in the command line */ +- && !is_individual_file (name_buffer)) ++ if (one_file_system_option && st->parent ++ && stat_data->st_dev != st->parent->stat.st_dev) + /* FIXME: + WARNOPT (WARN_XDEV, + (0, 0, +diff --git a/src/names.c b/src/names.c +index 6e214bf..ba4d509 100644 +--- a/src/names.c ++++ b/src/names.c +@@ -47,8 +47,6 @@ static char *cached_no_such_gname; + static uid_t cached_no_such_uid; + static gid_t cached_no_such_gid; + +-static void register_individual_file (char const *name); +- + /* Given UID, find the corresponding UNAME. */ + void + uid_to_uname (uid_t uid, char **uname) +@@ -360,8 +358,6 @@ name_next_elt (int change_dirs) + { + if (unquote_option) + unquote_string (name_buffer); +- if (incremental_option) +- register_individual_file (name_buffer); + entry.type = ep->type; + entry.v.name = name_buffer; + return &entry; +@@ -1152,28 +1148,6 @@ excluded_name (char const *name) + return excluded_file_name (excluded, name + FILE_SYSTEM_PREFIX_LEN (name)); + } + +-static Hash_table *individual_file_table; +- +-static void +-register_individual_file (char const *name) +-{ +- struct stat st; +- +- if (deref_stat (name, &st) != 0) +- return; /* Will be complained about later */ +- if (S_ISDIR (st.st_mode)) +- return; +- +- hash_string_insert (&individual_file_table, name); +-} +- +-bool +-is_individual_file (char const *name) +-{ +- return hash_string_lookup (individual_file_table, name); +-} +- +- + + /* Return the size of the prefix of FILE_NAME that is removed after + stripping NUM leading file name components. NUM must be +-- +1.7.1 + +From: Paul Eggert <eggert(a)cs.ucla.edu> +Date: Tue, 23 Nov 2010 01:58:55 +0000 (-0800) +Subject: tests: new test listed04 for --one-file-system --listed-incremental +X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=tar.git;a=commitdiff_plain;h=2a55b4b0… + +tests: new test listed04 for --one-file-system --listed-incremental + +* tests/Makefile.am (TESTSUITE_AT): Add listed04.at. +* tests/listed04.at: New file. +* tests/testsuite.at: Include it. +--- + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index f289067..7b1e226 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -110,6 +110,7 @@ TESTSUITE_AT = \ + listed01.at\ + listed02.at\ + listed03.at\ ++ listed04.at\ + long01.at\ + longv7.at\ + lustar01.at\ +diff --git a/tests/listed04.at b/tests/listed04.at +new file mode 100644 +index 0000000..239998d +--- /dev/null ++++ b/tests/listed04.at +@@ -0,0 +1,47 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++ ++# Test suite for GNU tar. ++# Copyright (C) 2010 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++# This checks for the bug reported by Martin Weigel ++# <http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00071.html>. ++# The test is derived from the ideas in Jean-Louis Martineau's followup email ++# <http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00087.html>. ++ ++AT_SETUP([--listed-incremental and --one-file-system]) ++AT_KEYWORDS([listed incremental listed04]) ++ ++AT_TAR_CHECK([ ++ ++mkdir dir ++echo a >dir/a ++echo b >dir/b ++ ++tar --one-file-system -cvf archive.tar -g archive.incr dir || exit ++tar -tf archive.tar || exit ++], ++[0], ++[dir/ ++dir/a ++dir/b ++dir/ ++dir/a ++dir/b ++], ++[tar: dir: Directory is new ++],[],[],[gnu]) ++ ++AT_CLEANUP +diff --git a/tests/testsuite.at b/tests/testsuite.at +index db0db3a..e8df868 100644 +--- a/tests/testsuite.at ++++ b/tests/testsuite.at +@@ -174,6 +174,7 @@ m4_include([incr02.at]) + m4_include([listed01.at]) + m4_include([listed02.at]) + m4_include([listed03.at]) ++m4_include([listed04.at]) + m4_include([incr03.at]) + m4_include([incr04.at]) + m4_include([incr05.at]) diff --git a/pkgs/core/tar/patches/tar-1.25-sparse-names.patch b/pkgs/core/tar/patches/tar-1.25-sparse-names.patch new file mode 100644 index 0000000..890726d --- /dev/null +++ b/pkgs/core/tar/patches/tar-1.25-sparse-names.patch @@ -0,0 +1,126 @@ +From 3f7aebf6e15d2ee39f55528cc9f423b330e68272 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray(a)gnu.org.ua> +Date: Sat, 27 Nov 2010 14:35:08 +0200 +Subject: [PATCH] Correctly store long sparse file names in PAX archives. + +* src/sparse.c (pax_dump_header_1): Make sure the created header name is +shorter than NAME_FIELD_SIZE bytes. +* tests/sparse04.at: New testcase. +* tests/Makefile.am (TESTSUITE_AT): Add sparse04.at. +* tests/testsuite.at: Include sparse04.at. +* NEWS: Update. +--- + src/sparse.c | 9 ++++++--- + tests/Makefile.am | 1 + + tests/sparse04.at | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + tests/testsuite.at | 1 + + 4 files changed, 55 insertions(+), 3 deletions(-) + create mode 100644 tests/sparse04.at + +diff --git a/src/sparse.c b/src/sparse.c +index 9680b60..696773f 100644 +--- a/src/sparse.c ++++ b/src/sparse.c +@@ -991,7 +991,7 @@ pax_dump_header_1 (struct tar_sparse_file *file) + off_t size = 0; + struct sp_array *map = file->stat_info->sparse_map; + char *save_file_name = file->stat_info->file_name; +- ++ + #define COPY_STRING(b,dst,src) do \ + { \ + char *endp = b->buffer + BLOCKSIZE; \ +@@ -1029,8 +1029,11 @@ pax_dump_header_1 (struct tar_sparse_file *file) + xheader_store ("GNU.sparse.name", file->stat_info, NULL); + xheader_store ("GNU.sparse.realsize", file->stat_info, NULL); + +- file->stat_info->file_name = xheader_format_name (file->stat_info, +- "%d/GNUSparseFile.%p/%f", 0); ++ file->stat_info->file_name = ++ xheader_format_name (file->stat_info, "GNUSparseFile.%p/%f", 0); ++ /* Make sure the created header name is shorter than NAME_FIELD_SIZE: */ ++ if (strlen (file->stat_info->file_name) > NAME_FIELD_SIZE) ++ file->stat_info->file_name[NAME_FIELD_SIZE] = 0; + + blk = start_header (file->stat_info); + /* Store the effective (shrunken) file size */ +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 12e8c1b..b14b40a 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -145,6 +145,7 @@ TESTSUITE_AT = \ + sparse01.at\ + sparse02.at\ + sparse03.at\ ++ sparse04.at\ + sparsemv.at\ + sparsemvp.at\ + spmvp00.at\ +diff --git a/tests/sparse04.at b/tests/sparse04.at +new file mode 100644 +index 0000000..4d41be7 +--- /dev/null ++++ b/tests/sparse04.at +@@ -0,0 +1,47 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# ++# Test suite for GNU tar. ++# Copyright (C) 2010 Free Software Foundation, Inc. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. ++ ++AT_SETUP([storing long sparse file names]) ++AT_KEYWORDS([sparse sparse04]) ++ ++# Description: Tar versions from 1.15.92 to 1.25 would incorrectly ++# store sparse file names longer than 100 characters in pax mode. ++# Namely, the `path' keyword of the produced PAX header would contain the ++# crafted name of the header itself, instead of that of the file. ++# Reported by: Kamil Dudka <kdudka(a)redhat.com> ++# References: <201011250026.44908.kdudka(a)redhat.com>, ++# http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00099.html ++ ++m4_define([NAME_111], ++ [123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960]) ++ ++AT_TAR_CHECK([ ++genfile --sparse --file NAME_111 --block-size 512 8M A || AT_SKIP_TEST ++tar -c --sparse --posix NAME_111 | tar t ++], ++[0], ++[NAME_111 ++], ++[], ++[], ++[], ++[pax]) ++ ++AT_CLEANUP +diff --git a/tests/testsuite.at b/tests/testsuite.at +index d18b16e..6f06417 100644 +--- a/tests/testsuite.at ++++ b/tests/testsuite.at +@@ -223,6 +223,7 @@ m4_include([shortrec.at]) + m4_include([sparse01.at]) + m4_include([sparse02.at]) + m4_include([sparse03.at]) ++m4_include([sparse04.at]) + m4_include([sparsemv.at]) + m4_include([spmvp00.at]) + m4_include([spmvp01.at]) +-- +1.7.3.2 + diff --git a/pkgs/core/tar/patches/tar-sigpipe.patch b/pkgs/core/tar/patches/tar-sigpipe.patch new file mode 100644 index 0000000..a4813f2 --- /dev/null +++ b/pkgs/core/tar/patches/tar-sigpipe.patch @@ -0,0 +1,12 @@ +diff -urNp tar-1.24-orig/tests/testsuite.at tar-1.24/tests/testsuite.at +--- tar-1.24-orig/tests/testsuite.at 2010-10-27 18:00:59.792862595 +0200 ++++ tar-1.24/tests/testsuite.at 2010-10-27 18:02:06.441873697 +0200 +@@ -245,7 +245,7 @@ m4_include([remfiles01.at]) + m4_include([remfiles02.at]) + m4_include([remfiles03.at]) + +-m4_include([sigpipe.at]) ++dnl m4_include([sigpipe.at]) + + m4_include([star/gtarfail.at]) + m4_include([star/gtarfail2.at]) diff --git a/pkgs/core/tar/tar.nm b/pkgs/core/tar/tar.nm index c1a3b27..8e764e3 100644 --- a/pkgs/core/tar/tar.nm +++ b/pkgs/core/tar/tar.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = tar -PKG_VER = 1.23 -PKG_REL = 2 +PKG_VER = 1.25 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Packaging @@ -34,7 +34,8 @@ PKG_URL = http://www.gnu.org/software/tar/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = A GNU file archiving program. -PKG_BUILD_DEPS+= autoconf automake libacl-devel libattr-devel libselinux-devel +PKG_BUILD_DEPS+= autoconf automake gettext libacl-devel libattr-devel \ + libselinux-devel define PKG_DESCRIPTION The GNU tar program saves many files together in one archive \ @@ -46,9 +47,9 @@ define PKG_DESCRIPTION and the ability to perform incremental and full backups. endef -PKG_TARBALL = $(THISAPP).tar.gz +PKG_TARBALL = $(THISAPP).tar.xz -CONFIGURE_ENVIRONMENT = CC="gcc -std=gnu99 -fgnu89-inline" +CONFIGURE_ENVIRONMENT = FORCE_UNSAFE_CONFIGURE=1 CONFIGURE_OPTIONS += \ --bindir=/bin \ @@ -56,10 +57,9 @@ CONFIGURE_OPTIONS += \ --enable-selinux define STAGE_PREPARE_CMDS - cd $(DIR_APP) && sed -i /SIGPIPE/d src/tar.c + cd $(DIR_APP) && autoreconf -vfi endef define STAGE_TEST - cd $(DIR_APP) && sed -i '35 i AT_UNPRIVILEGED_PREREQ' tests/remfiles01.at cd $(DIR_APP) && make check endef diff --git a/tools/packager b/tools/packager index c998780..4d6e51f 100755 --- a/tools/packager +++ b/tools/packager @@ -24,7 +24,7 @@ BASEDIR=$(dirname ${0}) PACKAGER_HASH_ALGORITHMS="md5 sha1 sha256 sha512" PACKAGER_VERSION="1" -TAR_OPTIONS="--posix --acls --no-recursion --sparse --xz" +TAR_OPTIONS="--posix --acls --xattrs --selinux --no-recursion --sparse --xz" . ${BASEDIR}/common-functions hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-core45, created. ce97b3f3fc7616690aa7d405013f9ae62b7f04d4
by git＠ipfire.org 26 Jan '11

26 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.9-core45 has been created at ce97b3f3fc7616690aa7d405013f9ae62b7f04d4 (commit) - Log ----------------------------------------------------------------- commit ce97b3f3fc7616690aa7d405013f9ae62b7f04d4 Merge: 051cb35 f89463d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 26 22:07:24 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core45, created. ce97b3f3fc7616690aa7d405013f9ae62b7f04d4
by git＠ipfire.org 26 Jan '11

26 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core45 has been created at ce97b3f3fc7616690aa7d405013f9ae62b7f04d4 (commit) - Log ----------------------------------------------------------------- commit ce97b3f3fc7616690aa7d405013f9ae62b7f04d4 Merge: 051cb35 f89463d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 26 22:07:24 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit 051cb353c6497ee22222a876e09472e048d20115 Merge: 49ec908 8885467 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 26 21:39:38 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit 49ec908e2d359656e154184b85024546d82767c2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 16 12:49:46 2011 +0100 Xen-Kernel: add version to grub menu. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f89463d829e35e0d6b0b6894acaa0c80a35f3c0b
by git＠ipfire.org 26 Jan '11

26 Jan '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 8885467fc1c5f93066e214b47100bcc3a1edad90
by git＠ipfire.org 26 Jan '11

26 Jan '11

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2011