diff --git a/slices/adduser.yaml b/slices/adduser.yaml index 07b4c1e8d..37abde9fa 100644 --- a/slices/adduser.yaml +++ b/slices/adduser.yaml @@ -7,12 +7,16 @@ slices: bins: essential: - adduser_config + - adduser_modules - passwd_bins contents: /usr/sbin/addgroup: /usr/sbin/adduser: /usr/sbin/delgroup: /usr/sbin/deluser: + + modules: + contents: /usr/share/perl5/Debian/AdduserCommon.pm: /usr/share/perl5/Debian/AdduserLogging.pm: /usr/share/perl5/Debian/AdduserRetvalues.pm: diff --git a/slices/cron.yaml b/slices/cron.yaml index 04e14c101..5d7ff7142 100644 --- a/slices/cron.yaml +++ b/slices/cron.yaml @@ -23,8 +23,8 @@ slices: /etc/default/cron: /etc/init.d/cron: /etc/pam.d/cron: - /etc/supercat/spcrc-crontab*: - /usr/lib/systemd/system/cron.service: + /etc/supercat/spcrc-crontab: + /etc/supercat/spcrc-crontab-light: copyright: contents: diff --git a/slices/erlang-asn1.yaml b/slices/erlang-asn1.yaml index 5d725c82c..dd9467154 100644 --- a/slices/erlang-asn1.yaml +++ b/slices/erlang-asn1.yaml @@ -9,8 +9,8 @@ slices: - erlang-base_bins - libc6_libs contents: - /usr/lib/erlang/lib/asn1-5.0.21.1/ebin/**: - /usr/lib/erlang/lib/asn1-5.0.21.1/priv/**: + /usr/lib/erlang/lib/asn1-*/ebin/**: + /usr/lib/erlang/lib/asn1-*/priv/**: copyright: contents: diff --git a/slices/erlang-base.yaml b/slices/erlang-base.yaml index 7dc5e57fd..b8a8f1115 100644 --- a/slices/erlang-base.yaml +++ b/slices/erlang-base.yaml @@ -7,9 +7,7 @@ slices: bins: essential: - adduser_bins - - erlang-base_config - erlang-base_libs - - erlang-base_releases - libc6_libs - libgcc-s1_libs - libstdc++6_libs @@ -19,32 +17,25 @@ slices: - zlib1g_libs contents: /usr/bin/epmd: - /usr/bin/erl*: + /usr/bin/erl: + /usr/bin/erl_call: + /usr/bin/erlc: /usr/bin/escript: /usr/bin/run_erl: /usr/bin/start_embedded: /usr/bin/to_erl: /usr/lib/erlang/bin/**: - /usr/lib/erlang/erts-13.2.2.5/bin/**: - /usr/lib/erlang/lib/erl_interface-5.3.2.1/bin/erl_call: + /usr/lib/erlang/erts-*/bin/**: + /usr/lib/erlang/lib/erl_interface-*/bin/erl_call: libs: contents: - /usr/lib/erlang/lib/compiler-8.2.6.3/ebin/**: - /usr/lib/erlang/lib/erts-13.2.2.5/ebin/**: - /usr/lib/erlang/lib/kernel-8.5.4.2/ebin/**: - /usr/lib/erlang/lib/sasl-4.2/ebin/**: - /usr/lib/erlang/lib/stdlib-4.3.1.3/ebin/**: - /usr/lib/erlang/lib/stdlib-4.3.1.3/include/**: - - config: - contents: - /usr/lib/systemd/system/epmd.service: - /usr/lib/systemd/system/epmd.socket: - - releases: - contents: - /usr/lib/erlang/releases/**: + /usr/lib/erlang/lib/compiler-*/ebin/**: + /usr/lib/erlang/lib/erts-*/ebin/**: + /usr/lib/erlang/lib/kernel-*/ebin/**: + /usr/lib/erlang/lib/sasl-*/ebin/**: + /usr/lib/erlang/lib/stdlib-*/ebin/**: + /usr/lib/erlang/lib/stdlib-*/include/**: copyright: contents: diff --git a/slices/erlang-crypto.yaml b/slices/erlang-crypto.yaml index cc1160600..e0433fa64 100644 --- a/slices/erlang-crypto.yaml +++ b/slices/erlang-crypto.yaml @@ -10,8 +10,8 @@ slices: - libc6_libs - libssl3t64_libs contents: - /usr/lib/erlang/lib/crypto-5.1.4.1/ebin/**: - /usr/lib/erlang/lib/crypto-5.1.4.1/priv/lib/**: + /usr/lib/erlang/lib/crypto-*/ebin/**: + /usr/lib/erlang/lib/crypto-*/priv/lib/**: copyright: contents: diff --git a/slices/erlang-eldap.yaml b/slices/erlang-eldap.yaml index 52db03b2f..6b18bef80 100644 --- a/slices/erlang-eldap.yaml +++ b/slices/erlang-eldap.yaml @@ -10,7 +10,7 @@ slices: - erlang-base_bins - erlang-ssl_libs contents: - /usr/lib/erlang/lib/eldap-1.2.11/ebin/**: + /usr/lib/erlang/lib/eldap-*/ebin/**: copyright: contents: diff --git a/slices/erlang-ftp.yaml b/slices/erlang-ftp.yaml index b9337eb2f..3d932c728 100644 --- a/slices/erlang-ftp.yaml +++ b/slices/erlang-ftp.yaml @@ -10,7 +10,7 @@ slices: - erlang-runtime-tools_libs - erlang-ssl_libs contents: - /usr/lib/erlang/lib/ftp-1.1.4/ebin/**: + /usr/lib/erlang/lib/ftp-*/ebin/**: copyright: contents: diff --git a/slices/erlang-inets.yaml b/slices/erlang-inets.yaml index b6915f4a1..4bfa50758 100644 --- a/slices/erlang-inets.yaml +++ b/slices/erlang-inets.yaml @@ -5,21 +5,22 @@ essential: slices: bins: + essential: + - erlang-inets_libs + contents: + /usr/lib/erlang/lib/inets-*/priv/bin/runcgi.sh: + + libs: essential: - erlang-base_bins - erlang-ftp_libs - - erlang-inets_libs - erlang-mnesia_libs - erlang-runtime-tools_libs - erlang-ssl_libs - erlang-tftp_libs contents: - /usr/lib/erlang/lib/inets-8.3.1.2/priv/bin/runcgi.sh: - - libs: - contents: - /usr/lib/erlang/lib/inets-8.3.1.2/ebin/**: - /usr/lib/erlang/lib/inets-8.3.1.2/include/**: + /usr/lib/erlang/lib/inets-*/ebin/**: + /usr/lib/erlang/lib/inets-*/include/**: copyright: contents: diff --git a/slices/erlang-mnesia.yaml b/slices/erlang-mnesia.yaml index 9f3d36596..f95ca0024 100644 --- a/slices/erlang-mnesia.yaml +++ b/slices/erlang-mnesia.yaml @@ -8,7 +8,7 @@ slices: essential: - erlang-base_bins contents: - /usr/lib/erlang/lib/mnesia-4.21.4.2/ebin/**: + /usr/lib/erlang/lib/mnesia-*/ebin/**: copyright: contents: diff --git a/slices/erlang-os-mon.yaml b/slices/erlang-os-mon.yaml index fe1a33b21..604488d5b 100644 --- a/slices/erlang-os-mon.yaml +++ b/slices/erlang-os-mon.yaml @@ -4,6 +4,12 @@ essential: - erlang-os-mon_copyright slices: + bins: + essential: + - erlang-os-mon_libs + contents: + /usr/lib/erlang/lib/os_mon-*/priv/**: + libs: essential: - erlang-base_bins @@ -11,8 +17,7 @@ slices: - erlang-snmp_bins - libc6_libs contents: - /usr/lib/erlang/lib/os_mon-2.8.2/ebin/**: - /usr/lib/erlang/lib/os_mon-2.8.2/priv/**: + /usr/lib/erlang/lib/os_mon-*/ebin/**: copyright: contents: diff --git a/slices/erlang-parsetools.yaml b/slices/erlang-parsetools.yaml index 38c5289f8..d5e2089a4 100644 --- a/slices/erlang-parsetools.yaml +++ b/slices/erlang-parsetools.yaml @@ -8,7 +8,7 @@ slices: essential: - erlang-base_bins contents: - /usr/lib/erlang/lib/parsetools-2.4.1/ebin/**: + /usr/lib/erlang/lib/parsetools-*/ebin/**: copyright: contents: diff --git a/slices/erlang-public-key.yaml b/slices/erlang-public-key.yaml index 47bd413cd..07cbe2217 100644 --- a/slices/erlang-public-key.yaml +++ b/slices/erlang-public-key.yaml @@ -10,7 +10,7 @@ slices: - erlang-base_bins - erlang-crypto_libs contents: - /usr/lib/erlang/lib/public_key-1.13.3.2/ebin/**: + /usr/lib/erlang/lib/public_key-*/ebin/**: copyright: contents: diff --git a/slices/erlang-runtime-tools.yaml b/slices/erlang-runtime-tools.yaml index 978c659c8..1439735b3 100644 --- a/slices/erlang-runtime-tools.yaml +++ b/slices/erlang-runtime-tools.yaml @@ -10,8 +10,8 @@ slices: - erlang-mnesia_libs - libc6_libs contents: - /usr/lib/erlang/lib/runtime_tools-1.19/ebin/**: - /usr/lib/erlang/lib/runtime_tools-1.19/priv/**: + /usr/lib/erlang/lib/runtime_tools-*/ebin/**: + /usr/lib/erlang/lib/runtime_tools-*/priv/**: copyright: contents: diff --git a/slices/erlang-snmp.yaml b/slices/erlang-snmp.yaml index 6b98c043f..39993ab3e 100644 --- a/slices/erlang-snmp.yaml +++ b/slices/erlang-snmp.yaml @@ -14,18 +14,18 @@ slices: - erlang-snmp_libs contents: /usr/bin/snmpc: - /usr/lib/erlang/lib/snmp-5.13.5/bin/snmpc: + /usr/lib/erlang/lib/snmp-*/bin/snmpc: config: contents: - /usr/lib/erlang/lib/snmp-5.13.5/priv/conf/**: + /usr/lib/erlang/lib/snmp-*/priv/conf/**: libs: contents: - /usr/lib/erlang/lib/snmp-5.13.5/ebin/**: - /usr/lib/erlang/lib/snmp-5.13.5/include/**: - /usr/lib/erlang/lib/snmp-5.13.5/mibs/**: - /usr/lib/erlang/lib/snmp-5.13.5/priv/mibs/**: + /usr/lib/erlang/lib/snmp-*/ebin/**: + /usr/lib/erlang/lib/snmp-*/include/**: + /usr/lib/erlang/lib/snmp-*/mibs/**: + /usr/lib/erlang/lib/snmp-*/priv/mibs/**: copyright: contents: diff --git a/slices/erlang-ssl.yaml b/slices/erlang-ssl.yaml index db818bc92..9fae2527a 100644 --- a/slices/erlang-ssl.yaml +++ b/slices/erlang-ssl.yaml @@ -11,7 +11,7 @@ slices: - erlang-public-key_libs - erlang-runtime-tools_libs contents: - /usr/lib/erlang/lib/ssl-10.9.1.3/ebin/**: + /usr/lib/erlang/lib/ssl-*/ebin/**: copyright: contents: diff --git a/slices/erlang-syntax-tools.yaml b/slices/erlang-syntax-tools.yaml index 0ea454254..45ba7a161 100644 --- a/slices/erlang-syntax-tools.yaml +++ b/slices/erlang-syntax-tools.yaml @@ -8,8 +8,8 @@ slices: essential: - erlang-base_bins contents: - /usr/lib/erlang/lib/syntax_tools-3.0.1/ebin/**: - /usr/lib/erlang/lib/syntax_tools-3.0.1/include/**: + /usr/lib/erlang/lib/syntax_tools-*/ebin/**: + /usr/lib/erlang/lib/syntax_tools-*/include/**: copyright: contents: diff --git a/slices/erlang-tftp.yaml b/slices/erlang-tftp.yaml index 39d7aa9c4..f04850ddc 100644 --- a/slices/erlang-tftp.yaml +++ b/slices/erlang-tftp.yaml @@ -8,7 +8,7 @@ slices: essential: - erlang-base_bins contents: - /usr/lib/erlang/lib/tftp-1.0.4/ebin/**: + /usr/lib/erlang/lib/tftp-*/ebin/**: copyright: contents: diff --git a/slices/erlang-tools.yaml b/slices/erlang-tools.yaml index ffa54318d..d4ef47219 100644 --- a/slices/erlang-tools.yaml +++ b/slices/erlang-tools.yaml @@ -9,9 +9,9 @@ slices: - erlang-base_bins - erlang-runtime-tools_libs contents: - /usr/lib/erlang/lib/tools-3.5.3/ebin/**: - /usr/lib/erlang/lib/tools-3.5.3/emacs/**: - /usr/lib/erlang/lib/tools-3.5.3/priv/**: + /usr/lib/erlang/lib/tools-*/ebin/**: + /usr/lib/erlang/lib/tools-*/emacs/**: + /usr/lib/erlang/lib/tools-*/priv/**: copyright: contents: diff --git a/slices/erlang-xmerl.yaml b/slices/erlang-xmerl.yaml index 3f90ebb85..8db5dcdec 100644 --- a/slices/erlang-xmerl.yaml +++ b/slices/erlang-xmerl.yaml @@ -8,7 +8,7 @@ slices: essential: - erlang-base_bins contents: - /usr/lib/erlang/lib/xmerl-1.3.31.1/ebin/**: + /usr/lib/erlang/lib/xmerl-*/ebin/**: copyright: contents: diff --git a/slices/libpam-runtime.yaml b/slices/libpam-runtime.yaml index 7547a56c8..99ec5ebec 100644 --- a/slices/libpam-runtime.yaml +++ b/slices/libpam-runtime.yaml @@ -22,7 +22,6 @@ slices: # until appropriate solution for emulating what pam-auth-update can do (or maybe something else). bins: essential: - - debconf_bins - libpam-modules_config - libpam-runtime_config - libpam-runtime_pam-config diff --git a/slices/libpam0g.yaml b/slices/libpam0g.yaml index 883fa7027..f611580e0 100644 --- a/slices/libpam0g.yaml +++ b/slices/libpam0g.yaml @@ -6,7 +6,6 @@ essential: slices: libs: essential: - - debconf_bins - libaudit1_libs - libc6_libs contents: diff --git a/slices/logrotate.yaml b/slices/logrotate.yaml index 4a46c64e0..49030f1d4 100644 --- a/slices/logrotate.yaml +++ b/slices/logrotate.yaml @@ -21,8 +21,6 @@ slices: /etc/logrotate.conf: /etc/logrotate.d/btmp: /etc/logrotate.d/wtmp: - /usr/lib/systemd/system/logrotate.service: - /usr/lib/systemd/system/logrotate.timer: copyright: contents: diff --git a/slices/rabbitmq-server.yaml b/slices/rabbitmq-server.yaml index 7e2bcffc2..d49b87ac1 100644 --- a/slices/rabbitmq-server.yaml +++ b/slices/rabbitmq-server.yaml @@ -4,10 +4,36 @@ essential: - rabbitmq-server_copyright slices: + autocomplete: + contents: + /usr/lib/rabbitmq/autocomplete/*: + bins: essential: - - adduser_bins - - base-files_base + - rabbitmq-server_libs + contents: + /usr/bin/rabbitmqadmin: + /usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server: + /usr/lib/rabbitmq/bin/rabbitmq*: + /usr/lib/rabbitmq/bin/vmware-rabbitmq: + /usr/lib/rabbitmq/lib/rabbitmq_server-3.12.1/sbin/rabbitmq-*: + /usr/lib/rabbitmq/lib/rabbitmq_server-3.12.1/sbin/vmware-rabbitmq: + /usr/sbin/rabbitmq-*: + /var/lib/rabbitmq/: + /var/lib/rabbitmq/.erlang.cookie: {text: DUMMY, mode: 0400} + /var/lib/rabbitmq/mnesia/: {mode: 0750} + /var/log/rabbitmq/: + + config: + contents: + /etc/default/rabbitmq-server: + /etc/init.d/rabbitmq-server: + /etc/rabbitmq/rabbitmq-env.conf: {copy: /usr/share/rabbitmq/rabbitmq-env.conf, mode: 0644} + + libs: + essential: + - base-files_etc + - base-files_var ## erlang* and logrotate packages do not exist for i386 ## for all other archs, uncomment all those slices below # - erlang-base_bins @@ -15,7 +41,7 @@ slices: # - erlang-eldap_libs # - erlang-inets_bins # - erlang-mnesia_libs - # - erlang-os-mon_libs + # - erlang-os-mon_bins # - erlang-parsetools_libs # - erlang-public-key_libs # - erlang-runtime-tools_libs @@ -23,40 +49,13 @@ slices: # - erlang-syntax-tools_libs # - erlang-tools_libs # - erlang-xmerl_libs - # - logrotate_bins - - openssl_bins - python3.12_standard - rabbitmq-server_config - - rabbitmq-server_libs - socat_bins contents: - /usr/bin/rabbitmqadmin: - /usr/lib/rabbitmq/bin/rabbitmq-*: - /usr/lib/rabbitmq/bin/vmware-rabbitmq: - /usr/lib/rabbitmq/lib/rabbitmq_server-3.12.1/sbin/rabbitmq-*: - /usr/lib/rabbitmq/lib/rabbitmq_server-3.12.1/sbin/vmware-rabbitmq: - /usr/sbin/rabbitmq-*: - - config: - contents: - /etc/default/rabbitmq-server: - /etc/init.d/rabbitmq-server: - /etc/logrotate.d/rabbitmq-server: - /etc/rabbitmq/rabbitmq-env.conf: {symlink: /usr/share/rabbitmq-env.conf} - /usr/lib/rabbitmq/autocomplete/*: - /usr/lib/systemd/system/rabbitmq-server.service: - /var/lib/rabbitmq/: - /var/lib/rabbitmq/.erlang.cookie: {text: DUMMY, mode: 0o400} - /var/lib/rabbitmq/mnesia/: {mode: 0o750} - /var/log/rabbitmq/: - - libs: - contents: - /usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server: /usr/lib/rabbitmq/lib/rabbitmq_server-3.12.1/escript/**: /usr/lib/rabbitmq/lib/rabbitmq_server-3.12.1/plugins/**: copyright: contents: - /usr/lib/rabbitmq/lib/rabbitmq_server-3.12.1/LICENSE*: /usr/share/doc/rabbitmq-server/copyright: diff --git a/slices/socat.yaml b/slices/socat.yaml index 617448545..6eaf63893 100644 --- a/slices/socat.yaml +++ b/slices/socat.yaml @@ -12,7 +12,11 @@ slices: contents: /usr/bin/filan: /usr/bin/procan: - /usr/bin/socat*: + /usr/bin/socat: + /usr/bin/socat-broker.sh: + /usr/bin/socat-chain.sh: + /usr/bin/socat-mux.sh: + /usr/bin/socat1: copyright: contents: