Browse Source

Sync with portage [Sun May 2 14:19:51 MSK 2021].

master
Calculate Linux 1 year ago
parent
commit
55d7ee4a42
  1. BIN
      Manifest.files.gz
  2. BIN
      acct-group/Manifest.gz
  3. 0
      acct-group/github-exporter/Manifest
  4. 8
      acct-group/github-exporter/github-exporter-0.ebuild
  5. 8
      acct-group/github-exporter/metadata.xml
  6. 0
      acct-group/uucp/Manifest
  7. 7
      acct-group/uucp/metadata.xml
  8. 8
      acct-group/uucp/uucp-0-r1.ebuild
  9. BIN
      acct-user/Manifest.gz
  10. 0
      acct-user/github-exporter/Manifest
  11. 12
      acct-user/github-exporter/github-exporter-0.ebuild
  12. 8
      acct-user/github-exporter/metadata.xml
  13. 5
      acct-user/gpsd/gpsd-0-r2.ebuild
  14. BIN
      app-accessibility/Manifest.gz
  15. 1
      app-accessibility/at-spi2-core/Manifest
  16. 62
      app-accessibility/at-spi2-core/at-spi2-core-2.40.1.ebuild
  17. 1
      app-accessibility/espeakup/Manifest
  18. 58
      app-accessibility/espeakup/espeakup-0.71-r1.ebuild
  19. BIN
      app-admin/Manifest.gz
  20. 1
      app-admin/abrt/Manifest
  21. 129
      app-admin/abrt/abrt-2.14.5.ebuild
  22. 1
      app-admin/conserver/Manifest
  23. 97
      app-admin/conserver/conserver-8.2.3-r1.ebuild
  24. 2
      app-admin/conserver/conserver-8.2.6-r1.ebuild
  25. 31
      app-admin/conserver/files/8.2.3-libressl.patch
  26. 2
      app-admin/entr/entr-4.8.ebuild
  27. 5
      app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
  28. 2
      app-admin/logrotate/Manifest
  29. 14
      app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
  30. 101
      app-admin/logrotate/logrotate-3.14.0.ebuild
  31. 101
      app-admin/logrotate/logrotate-3.17.0.ebuild
  32. 3
      app-admin/rsyslog/metadata.xml
  33. 8
      app-admin/rsyslog/rsyslog-8.2008.0.ebuild
  34. 8
      app-admin/rsyslog/rsyslog-8.2010.0.ebuild
  35. 8
      app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
  36. 8
      app-admin/rsyslog/rsyslog-8.2012.0.ebuild
  37. 8
      app-admin/rsyslog/rsyslog-8.2102.0.ebuild
  38. 8
      app-admin/rsyslog/rsyslog-8.2104.0.ebuild
  39. 2
      app-admin/sysklogd/Manifest
  40. 84
      app-admin/sysklogd/sysklogd-2.1.2.ebuild
  41. 84
      app-admin/sysklogd/sysklogd-2.2.1.ebuild
  42. 7
      app-admin/tripwire/tripwire-2.4.3.7.ebuild
  43. BIN
      app-antivirus/Manifest.gz
  44. 5
      app-antivirus/clamav/clamav-0.103.2.ebuild
  45. BIN
      app-arch/Manifest.gz
  46. 2
      app-arch/bzip2/Manifest
  47. 118
      app-arch/bzip2/bzip2-1.0.6-r11.ebuild
  48. 115
      app-arch/bzip2/bzip2-1.0.7-r1.ebuild
  49. 21
      app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
  50. 18
      app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
  51. 27
      app-arch/bzip2/files/bzip2-1.0.6-mingw.patch
  52. 30
      app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch
  53. 79
      app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
  54. 13
      app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
  55. 24
      app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch
  56. 76
      app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
  57. 13
      app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
  58. 1
      app-arch/gnome-autoar/Manifest
  59. 43
      app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild
  60. 12
      app-arch/libarchive/files/libarchive-3.3.3-libressl.patch
  61. 1
      app-arch/libarchive/libarchive-3.5.1.ebuild
  62. 2
      app-arch/ncompress/Manifest
  63. 27
      app-arch/ncompress/ncompress-4.2.4.5.ebuild
  64. 29
      app-arch/ncompress/ncompress-4.2.4.6.ebuild
  65. 39
      app-arch/sharutils/sharutils-4.15.2-r1.ebuild
  66. 10
      app-arch/unshield/unshield-1.4.3.ebuild
  67. 5
      app-arch/xar/xar-1.8-r2.ebuild
  68. 5
      app-arch/xar/xar-1.8-r3.ebuild
  69. 6
      app-arch/xar/xar-1.8-r4.ebuild
  70. BIN
      app-backup/Manifest.gz
  71. 6
      app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
  72. 17
      app-backup/bacula/bacula-9.6.5.ebuild
  73. 17
      app-backup/bacula/bacula-9.6.6.ebuild
  74. 17
      app-backup/bacula/bacula-9.6.7.ebuild
  75. 10
      app-backup/bareos/bareos-17.2.10.ebuild
  76. 10
      app-backup/bareos/bareos-18.2.10.ebuild
  77. 10
      app-backup/bareos/bareos-19.2.9.ebuild
  78. 4
      app-backup/borgbackup/borgbackup-1.1.15.ebuild
  79. 4
      app-backup/borgbackup/borgbackup-1.1.16.ebuild
  80. 6
      app-backup/borgbackup/borgbackup-9999.ebuild
  81. 7
      app-backup/burp/burp-2.2.18-r1.ebuild
  82. 7
      app-backup/burp/burp-2.3.36.ebuild
  83. 7
      app-backup/rear/rear-2.4.ebuild
  84. 2
      app-backup/rear/rear-2.6.ebuild
  85. 7
      app-backup/tarsnap/tarsnap-1.0.37.ebuild
  86. 7
      app-backup/tarsnap/tarsnap-1.0.39.ebuild
  87. 5
      app-backup/zbackup/zbackup-1.4.4-r2.ebuild
  88. 5
      app-backup/zbackup/zbackup-9999.ebuild
  89. BIN
      app-benchmarks/Manifest.gz
  90. 49
      app-benchmarks/httperf/files/httperf-0.9.1_p20181111-libressl.patch
  91. 9
      app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
  92. 7
      app-benchmarks/httperf/httperf-0.9.1_p20181111.ebuild
  93. 7
      app-benchmarks/siege/siege-4.0.7.ebuild
  94. 5
      app-benchmarks/siege/siege-4.0.8.ebuild
  95. 4
      app-benchmarks/wrk/wrk-4.1.0-r100.ebuild
  96. BIN
      app-crypt/Manifest.gz
  97. 6
      app-crypt/cardpeek/cardpeek-0.8.4.ebuild
  98. 101
      app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl-r1.patch
  99. 42
      app-crypt/mit-krb5/files/mit-krb5-1.18-libressl.patch
  100. 7
      app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild

BIN
Manifest.files.gz

BIN
acct-group/Manifest.gz

0
acct-group/github-exporter/Manifest

8
acct-group/github-exporter/github-exporter-0.ebuild

@ -0,0 +1,8 @@
# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
ACCT_GROUP_ID=238

8
acct-group/github-exporter/metadata.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
</pkgmetadata>

0
acct-group/uucp/Manifest

7
acct-group/uucp/metadata.xml

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>systemd@gentoo.org</email>
</maintainer>
</pkgmetadata>

8
acct-group/uucp/uucp-0-r1.ebuild

@ -0,0 +1,8 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
ACCT_GROUP_ID=14

BIN
acct-user/Manifest.gz

0
acct-user/github-exporter/Manifest

12
acct-user/github-exporter/github-exporter-0.ebuild

@ -0,0 +1,12 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-user
DESCRIPTION="user for github-exporter"
ACCT_USER_ID=238
ACCT_USER_GROUPS=( github-exporter )
acct-user_add_deps

8
acct-user/github-exporter/metadata.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
</pkgmetadata>

5
acct-user/gpsd/gpsd-0-r1.ebuild → acct-user/gpsd/gpsd-0-r2.ebuild

@ -1,4 +1,4 @@
# Copyright 2020 Gentoo Authors
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -7,6 +7,7 @@ inherit acct-user
DESCRIPTION="user for gpsd"
ACCT_USER_ID=299
ACCT_USER_GROUPS=( dialout )
# bug #744982
ACCT_USER_GROUPS=( dialout uucp )
acct-user_add_deps

BIN
app-accessibility/Manifest.gz

1
app-accessibility/at-spi2-core/Manifest

@ -1,2 +1,3 @@
DIST at-spi2-core-2.38.0.tar.xz 190540 BLAKE2B 6c5c479c279285460a5ff80533d600b5173fe9bedacfa1522bc37da4a305b965cec2c677eaae8be809ed1a5fd8aaef6475fd27b80510efd1c530e46368e954af SHA512 3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1
DIST at-spi2-core-2.40.0.tar.xz 197080 BLAKE2B 56c0ca8138b5178d713851ffb9a9299544a65708a3e5bf37b1e59e515bb30fccffd8b8cc9dea1e78c32a5d1fa3d21de506ef674c5e0ab8067a8ff5df206d349a SHA512 45f9123dac27982003e4c5e357ddaf31dbe945ff334bf1a7d02e81011b841bd69c717233e8b2d33abb6cfe16320bfe5893499f25d9f603cde5d11d63315e8725
DIST at-spi2-core-2.40.1.tar.xz 197064 BLAKE2B dfa19413e6688678fcc0c0ed76d0fca0d5de5039c9b1e42dc10c9c387c0cbffb3c6a38570f9e74c343fa86310f2c3f6fcf0e311c57d11b5adeac5faf7bdf9630 SHA512 fcb73e78a85db9b982ae10d8c968c7732079832877fa0214c30a04b9e27910448c3f5456b8628ed4a3d4dbd59037c8c206916ad1462ca5c7a44409a702096b14

62
app-accessibility/at-spi2-core/at-spi2-core-2.40.1.ebuild

@ -0,0 +1,62 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit gnome.org meson multilib-minimal systemd virtualx xdg
DESCRIPTION="D-Bus accessibility specifications and registration daemon"
HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="X gtk-doc +introspection"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
X? (
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXtst[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]
)
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/glib-utils
gtk-doc? (
>=dev-util/gtk-doc-1.25
app-text/docbook-xml-dtd:4.3
)
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
"
PATCHES=(
# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
)
multilib_src_configure() {
local emesonargs=(
-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-Ddocs=$(multilib_native_usex gtk-doc true false)
-Dintrospection=$(multilib_native_usex introspection)
-Dx11=$(usex X)
)
meson_src_configure
}
multilib_src_compile() {
meson_src_compile
}
multilib_src_test() {
virtx dbus-run-session meson test -C "${BUILD_DIR}"
}
multilib_src_install() {
meson_src_install
}

1
app-accessibility/espeakup/Manifest

@ -1,2 +1 @@
DIST espeakup-0.71.tar.bz2 24663 BLAKE2B b5cae80e7a6d45e599dd03680da398cc9db8eb98d0140d8e71aa5047607484401c3906386627810e3ff78a244c9c0e16383675fdd845802225fdb32c8b2a3dbd SHA512 01091560cd4843897fa6925a54b4c856fe57ed5728ddc0c091c93b1ae14eb2f4d07ab2247e40bd5a5968cc22ee3696abfe1b28f67b95aa7ab61e33667c51135d
DIST espeakup-0.80.tar.gz 39626 BLAKE2B f36d9776b954e73fd2bc33c7ba97dd323184480549b667ac2afc4dc40a8b98089b8ced16e8b1cb33e6b4c586df27a8d6f782236ef8770bc98a530665e257edcf SHA512 1b7e2bd46c3c13a5305746d2d2810ec94a8660f561e4f679ee4779be1b22178f8ac7de42d626d649710509f7b087b9a2f94608bde203d1bcd6d353229ed9ff83

58
app-accessibility/espeakup/espeakup-0.71-r1.ebuild

@ -1,58 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit linux-info
DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
HOMEPAGE="http://www.linux-speakup.org"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="|| (
app-accessibility/espeak[portaudio]
app-accessibility/espeak[pulseaudio] )"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
pkg_setup() {
if kernel_is -ge 2 6 37; then
check_extra_config
elif ! has_version app-accessibility/speakup; then
ewarn "Cannot find speakup on your system."
ewarn "Please upgrade your kernel to 2.6.37 or later and enable the"
ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options"
ewarn "or install app-accessibility/speakup."
fi
}
src_compile() {
emake
}
src_install() {
emake DESTDIR="${D}" install
dodoc ChangeLog README ToDo
newconfd "${FILESDIR}"/espeakup.confd espeakup
newinitd "${FILESDIR}"/espeakup.rc espeakup
}
pkg_postinst() {
elog "To get espeakup to start automatically, it is currently recommended"
elog "that you add it to the default run level, by giving the following"
elog "command as root."
elog
elog "rc-update add espeakup default"
elog
elog "You can also set a default voice now for espeakup."
elog "See /etc/conf.d/espeakup for how to do this."
}

BIN
app-admin/Manifest.gz

1
app-admin/abrt/Manifest

@ -1 +1,2 @@
DIST abrt-2.14.2.tar.gz 6113632 BLAKE2B 904ec2ca4c3aa70b62573ca2730742689f4446c1e5f04bfb6dc4267a4a9a6d44ef8c2b6e82c1e0aba04876b400c3a965a879da65bbff7ec729846f1b5c28cdf9 SHA512 82ba10cb151b4585024e3dfc626f46a7d967797e0375158cd76355c4f6a66c59578cc7b41bc5d5aaa3e694b3653b8658650df458676225660cfe95ec318c6886
DIST abrt-2.14.5.tar.gz 6056105 BLAKE2B 22e797a431237bd3d4ef6f2467842c5f08e2ef3ca51e7857e3c55e45ed93a9499843fe40b081c70affb5def8f2cfe78d61e865c51c969fb2c9936225bdfe4996 SHA512 a8672735c6d3263ddff006e6e186d9b71e6d9375a8c909c2a85bbbf736a6687b6fe4aa74640a07664f14fd886895a86babf41218a8c2365d6fccd347630ccc9e

129
app-admin/abrt/abrt-2.14.5.ebuild

@ -0,0 +1,129 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
inherit autotools python-single-r1 xdg-utils
DESCRIPTION="Automatic bug detection and reporting tool"
HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="selinux test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
>=dev-libs/glib-2.56:2
>=dev-libs/libreport-2.13.0[gtk,python]
dev-libs/libxml2:2
>=gnome-base/gsettings-desktop-schemas-3.15.1
net-libs/libsoup:2.4
sys-apps/dbus
sys-apps/systemd:0=
sys-auth/polkit
sys-libs/libcap
sys-fs/inotify-tools
x11-libs/gtk+:3
"
RDEPEND="${DEPEND}
acct-user/abrt
acct-group/abrt
app-arch/cpio
app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
dev-libs/elfutils
dev-libs/json-c:0=
sys-apps/util-linux
>=sys-devel/gdb-7
$(python_gen_cond_dep '
dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
dev-python/argh[${PYTHON_MULTI_USEDEP}]
dev-python/humanize[${PYTHON_MULTI_USEDEP}]
')
"
BDEPEND="
test? (
$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
)
app-text/asciidoc
app-text/xmlto
>=dev-util/intltool-0.35.0
virtual/pkgconfig
>=sys-devel/gettext-0.17
"
pkg_setup() {
python-single-r1_pkg_setup
}
src_prepare() {
python_fix_shebang .
default
# Install under proper directory
sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
# Ensure this works for systems with and without /usr merge
sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
# Fix hardcoded "pytest-3"
sed -i -e "s:pytest-3:pytest:" \
configure.ac src/python-problem/tests/Makefile.am src/cli/test || die
# pyhook test is sensitive to the format of python's error messages, and
# fails with certain python versions
sed -e '/pyhook.at/ d' \
-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
./gen-version || die # Needed to be run before autoreconf
eautoreconf
}
src_configure() {
myeconfargs=(
--libdir="${EPREFIX}/usr/$(get_libdir)"
--localstatedir="${EPREFIX}/var"
--without-bodhi
# package breaks due to not finding libreport-web with bodhi plugin enabled
--without-rpm
$(usex selinux "" "--without-selinux")
--with-python3
--without-pythondoc
# package breaks due to no sphinx-build-3
$(use_with test pythontests)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
python_optimize
keepdir /var/run/abrt
# /var/spool/abrt is created by dev-libs/libreport
diropts -m 700 -o abrt -g abrt
keepdir /var/spool/abrt-upload
diropts -m 775 -o abrt -g abrt
keepdir /var/cache/abrt-di
find "${D}" -name '*.la' -delete || die
newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
}
pkg_postinst() {
xdg_icon_cache_update
}
pkg_postrm() {
xdg_icon_cache_update
}

1
app-admin/conserver/Manifest

@ -1,2 +1 @@
DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283

97
app-admin/conserver/conserver-8.2.3-r1.ebuild

@ -1,97 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools pam ssl-cert
DESCRIPTION="Serial Console Manager"
HOMEPAGE="https://www.conserver.com"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-with-attribution"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
RESTRICT="!test? ( test )"
DEPEND="debug? ( dev-libs/dmalloc:= )
freeipmi? ( sys-libs/freeipmi:= )
kerberos? (
virtual/krb5
net-libs/libgssglue
)
ssl? ( dev-libs/openssl:0= )
pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
"
RDEPEND="${DEPEND}
pam? ( sys-auth/pambase )"
DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
src_prepare() {
default
sed -e '/^INSTALL_PROGRAM/s:-s::' \
-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
eautoreconf
}
src_configure() {
local myconf=(
$(use_with debug dmalloc)
$(use_with ipv6)
$(use_with freeipmi)
$(use_with kerberos gssapi)
$(use_with ssl openssl)
$(use_with pam)
$(use_with tcpd libwrap)
--with-cffile=conserver/conserver.cf
--with-logfile=/var/log/conserver.log
--with-master=localhost
--with-pidfile=/run/conserver.pid
--with-port=7782
--with-pwdfile=conserver/conserver.passwd
)
econf "${myconf[@]}"
}
src_install() {
emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
keepdir /var/consoles
fowners daemon:daemon /var/consoles
fperms 700 /var/consoles
newinitd "${FILESDIR}"/conserver.initd-r1 conserver
newconfd "${FILESDIR}"/conserver.confd-r1 conserver
dodir /etc/conserver
fperms 700 /etc/conserver
insinto /etc/conserver
newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
einstalldocs
docinto examples
dodoc -r conserver.cf/samples/.
if use pam; then
newpamd "${FILESDIR}"/conserver.pam-pambase conserver
fi
}
src_test() {
# hangs without -j1
emake -j1 test
}
pkg_postinst() {
if use ssl; then
if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
install_cert /etc/ssl/conserver/conserver
fi
fi
}

2
app-admin/conserver/conserver-8.2.6-r1.ebuild

@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-with-attribution"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
RESTRICT="!test? ( test )"

31
app-admin/conserver/files/8.2.3-libressl.patch

@ -1,31 +0,0 @@
From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Thu, 6 Jun 2019 21:30:16 -0700
Subject: [PATCH] libressl
backport of https://github.com/conserver/conserver/pull/26
---
conserver/cutil.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/conserver/cutil.h b/conserver/cutil.h
index 63aef65..07aa6d4 100644
--- a/conserver/cutil.h
+++ b/conserver/cutil.h
@@ -12,10 +12,12 @@
# include <openssl/err.h>
# if OPENSSL_VERSION_NUMBER < 0x10100000L
# define TLS_method SSLv23_method
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
# define CIPHER_SEC0
# else
# define CIPHER_SEC0 ":@SECLEVEL=0"
-# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
#endif
#if HAVE_GSSAPI
# include <gssapi/gssapi.h>
--
2.21.0

2
app-admin/entr/entr-4.8.ebuild

@ -11,7 +11,7 @@ SRC_URI="http://entrproject.org/code/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"

5
app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild

@ -14,13 +14,12 @@ SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
SLOT="0"
LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
KEYWORDS="amd64 x86"
IUSE="libressl X +pinentry test"
IUSE="X +pinentry test"
RESTRICT="!test? ( test )"
RDEPEND="
X? ( || ( x11-misc/xclip x11-misc/xsel ) )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
dev-libs/openssl:0=
net-misc/curl
dev-libs/libxml2
pinentry? ( app-crypt/pinentry )

2
app-admin/logrotate/Manifest

@ -1,3 +1 @@
DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
DIST logrotate-3.17.0.tar.gz 224559 BLAKE2B 6d019bafad6986a0b6264893d36a515db75d746dd590afd26825c01c68e9ccf3c260502a29912d75c069ece8715ae14d3c13d4030f6222187be0e1ca05d60e49 SHA512 ada4415ef68ad97c1415fa0c1ba7bf108621777cd91599bf4f999dea1c1025596543aa00fd579cae4d39315b71c4d8f96a9c9d1178f78be7c523470588ab1d31
DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4cadef01e6eebd172220227a7e1363e6731bc2ac511fa028078054b55d42b131cdc30232ac5762ce4c6cbff79c19681 SHA512 d1bca267fbec4acbb83ffba4d3ac4c864f4269d8513e5614e7dbe6f3b1f176685218bffdb5d62f559ee73f84cf9a8a257c9f63e30af058d12d0034240f247586

14
app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch

@ -1,14 +0,0 @@
diff -Nuar a/config.c b/config.c
--- a/config.c 2018-03-09 17:47:08.000000000 +0100
+++ b/config.c 2018-03-09 19:47:42.274696766 +0100
@@ -440,7 +440,9 @@
int i;
/* Check if fname is '.' or '..'; if so, return false */
- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
+ /* Don't include 'hidden' files either; this breaks Gentoo
+ portage config file management http://bugs.gentoo.org/87683 */
+ if (fname[0] == '.')
return 0;
/* Check if fname is ending in a taboo-extension; if so, return false */

101
app-admin/logrotate/logrotate-3.14.0.ebuild

@ -1,101 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit systemd tmpfiles
DESCRIPTION="Rotates, compresses, and mails system logs"
HOMEPAGE="https://github.com/logrotate/logrotate"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="acl +cron selinux"
COMMON_DEPEND="
>=dev-libs/popt-1.5
selinux? ( sys-libs/libselinux )
acl? ( virtual/acl )"
DEPEND="${COMMON_DEPEND}
>=sys-apps/sed-4"
RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-logrotate )
cron? ( virtual/cron )"
STATEFILE="/var/lib/misc/logrotate.status"
OLDSTATEFILE="/var/lib/logrotate.status"
move_old_state_file() {
elog "logrotate state file is now located at ${STATEFILE}"
elog "See bug #357275"
if [[ -e "${OLDSTATEFILE}" ]] ; then
elog "Moving your current state file to new location: ${STATEFILE}"
mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
fi
}
install_cron_file() {
exeinto /etc/cron.daily
newexe "${S}"/examples/logrotate.cron "${PN}"
}
PATCHES=(
"${FILESDIR}/${P}-ignore-hidden.patch"
)
src_prepare() {
sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
default
}
src_configure() {
econf \
$(use_with acl) \
$(use_with selinux) \
--with-state-file-path="${STATEFILE}"
}
src_test() {
emake test
}
src_install() {
insinto /usr
dobin logrotate
doman logrotate.8
dodoc ChangeLog.md examples/logrotate-default
insinto /etc
doins "${FILESDIR}"/logrotate.conf
use cron && install_cron_file
systemd_dounit examples/logrotate.{service,timer}
newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
keepdir /etc/logrotate.d
}
pkg_postinst() {
elog
elog "The ${PN} binary is now installed under /usr/bin. Please"
elog "update your links"
elog
move_old_state_file
elog "If you are running systemd you might need to run:"
elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
elog "in order to create the new location of the logrotate state file"
elog
if [[ -z ${REPLACING_VERSIONS} ]] ; then
elog "If you wish to have logrotate e-mail you updates, please"
elog "emerge virtual/mailx and configure logrotate in"
elog "/etc/logrotate.conf appropriately"
elog
elog "Additionally, /etc/logrotate.conf may need to be modified"
elog "for your particular needs. See man logrotate for details."
fi
}

101
app-admin/logrotate/logrotate-3.17.0.ebuild

@ -1,101 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit systemd tmpfiles
DESCRIPTION="Rotates, compresses, and mails system logs"
HOMEPAGE="https://github.com/logrotate/logrotate"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="acl +cron selinux"
COMMON_DEPEND="
>=dev-libs/popt-1.5
selinux? ( sys-libs/libselinux )
acl? ( virtual/acl )"
DEPEND="${COMMON_DEPEND}
>=sys-apps/sed-4"
RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-logrotate )
cron? ( virtual/cron )"
STATEFILE="/var/lib/misc/logrotate.status"
OLDSTATEFILE="/var/lib/logrotate.status"
move_old_state_file() {
elog "logrotate state file is now located at ${STATEFILE}"
elog "See bug #357275"
if [[ -e "${OLDSTATEFILE}" ]] ; then
elog "Moving your current state file to new location: ${STATEFILE}"
mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
fi
}
install_cron_file() {
exeinto /etc/cron.daily
newexe "${S}"/examples/logrotate.cron "${PN}"
}
PATCHES=(
"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
)
src_prepare() {
sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
default
}
src_configure() {
econf \
$(use_with acl) \
$(use_with selinux) \
--with-state-file-path="${STATEFILE}"
}
src_test() {
emake test
}
src_install() {
insinto /usr
dobin logrotate
doman logrotate.8
dodoc ChangeLog.md
insinto /etc
doins "${FILESDIR}"/logrotate.conf
use cron && install_cron_file
systemd_dounit examples/logrotate.{service,timer}
newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
keepdir /etc/logrotate.d
}
pkg_postinst() {
elog
elog "The ${PN} binary is now installed under /usr/bin. Please"
elog "update your links"
elog
move_old_state_file
elog "If you are running systemd you might need to run:"
elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
elog "in order to create the new location of the logrotate state file"
elog
if [[ -z ${REPLACING_VERSIONS} ]] ; then
elog "If you wish to have logrotate e-mail you updates, please"
elog "emerge virtual/mailx and configure logrotate in"
elog "/etc/logrotate.conf appropriately"
elog
elog "Additionally, /etc/logrotate.conf may need to be modified"
elog "for your particular needs. See man logrotate for details."
fi
}

3
app-admin/rsyslog/metadata.xml

@ -17,7 +17,6 @@
<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg> (you still need to enable functionality which requires OpenSSL)</flag>
<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag>
<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
@ -31,7 +30,7 @@
<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag>
<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag>
<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>

8
app-admin/rsyslog/rsyslog-8.2008.0.ebuild

@ -26,7 +26,7 @@ fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
RESTRICT="!test? ( test )"
@ -58,15 +58,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
>=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )

8
app-admin/rsyslog/rsyslog-8.2010.0.ebuild

@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
>=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )

8
app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild

@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
>=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )

8
app-admin/rsyslog/rsyslog-8.2012.0.ebuild

@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
>=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )

8
app-admin/rsyslog/rsyslog-8.2102.0.ebuild

@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
>=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )

8
app-admin/rsyslog/rsyslog-8.2104.0.ebuild

@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
>=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )

2
app-admin/sysklogd/Manifest

@ -1,3 +1 @@
DIST sysklogd-2.1.2.tar.gz 561286 BLAKE2B f70c2d116740930761677b9fdf715242844a583a59cd93c2e3408f985ce856d1a9eabc3ba736d18af44e8d154cdadec88035fc357db83eb504b4c6f800ea1f1d SHA512 dcd715939b4285e08ead0a1e797d09a8845156f456d3776cfcd0bcff7fbb9a306cb84a2b22731b430e2199d59ba42ab975fed6e675cf9d8a78833575c1490268
DIST sysklogd-2.2.1.tar.gz 440182 BLAKE2B 7b926a45dc2aaa9cc57655c5a5cbbe3d1f91a29a136435a477d571f43b307d4f125672784319891b7498641c3ae265c3bda22d84beab99022ef7a870a4d3f1c8 SHA512 4b26e494bfdd82666718fc37c16577cfa45ad7235e4e7b9f605f1ae51dd595f0a01281ecfa04e31b9a79c2de9de3c64d02dab27924e33532da49844d8011b626
DIST sysklogd-2.2.2.tar.gz 441106 BLAKE2B b99c63027468967083bb1338a6299bf2f58415c1d20a43f23ff613a5ce318c45c43640824bc82fe3ea423cd9432930a070354bb7a51281bd113b4d088bf17643 SHA512 5db5b0fc58530634627463a5b79ebc3b27c54284b371ce8c37cb6de4ed542640fb8a36e594bb73c0a541d22c6fa0ff985ad06cb2b76cd30cce988741ded86903

84
app-admin/sysklogd/sysklogd-2.1.2.ebuild

@ -1,84 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic systemd toolchain-funcs
DESCRIPTION="Standard log daemons"
HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
if [[ "${PV}" == *9999 ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
else
SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
LICENSE="BSD"
SLOT="0"
IUSE="logger logrotate systemd"
RESTRICT="test"
DEPEND="
logger? (
!<sys-apps/util-linux-2.34-r3
!>=sys-apps/util-linux-2.34-r3[logger]
)
"
RDEPEND="${DEPEND}
logrotate? ( app-admin/logrotate )"
DOCS=( ChangeLog.md README.md )
pkg_setup() {
append-lfs-flags
tc-export CC
}
src_prepare() {
default
[[ "${PV}" == *9999 ]] && eautoreconf
}
src_configure() {
local myeconfargs=(
--disable-static
--runstatedir="${EPREFIX}"/run
$(use_with logger)
$(use_with systemd systemd $(systemd_get_systemunitdir))
)
econf "${myeconfargs[@]}"
}
src_install() {
default
insinto /etc
doins syslog.conf
keepdir /etc/syslog.d
newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
if use logrotate ; then
insinto /etc/logrotate.d
newins "${FILESDIR}"/sysklogd.logrotate sysklogd
sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
fi
find "${ED}" -type f -name "*.la" -delete || die
}
pkg_postinst() {
if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
elog "Starting with version 2.0 syslogd has built in log rotation"
elog "functionality that does no longer require a running cron daemon."
elog "So we no longer install any log rotation cron files for sysklogd."
fi
if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
elog "Starting with version 2.1 sysklogd no longer provides klogd."
elog "syslogd now also logs kernel messages."
fi
}

84
app-admin/sysklogd/sysklogd-2.2.1.ebuild

@ -1,84 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic systemd toolchain-funcs
DESCRIPTION="Standard log daemons"
HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
if [[ "${PV}" == *9999 ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
else
SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
LICENSE="BSD"
SLOT="0"
IUSE="logger logrotate systemd"
RESTRICT="test"
DEPEND="
logger? (
!<sys-apps/util-linux-2.34-r3
!>=sys-apps/util-linux-2.34-r3[logger]
)
"
RDEPEND="${DEPEND}
logrotate? ( app-admin/logrotate )"
DOCS=( ChangeLog.md README.md )
pkg_setup() {
append-lfs-flags
tc-export CC
}
src_prepare() {
default
[[ "${PV}" == *9999 ]] && eautoreconf
}
src_configure() {
local myeconfargs=(
--disable-static
--runstatedir="${EPREFIX}"/run
$(use_with logger)
$(use_with systemd systemd $(systemd_get_systemunitdir))
)
econf "${myeconfargs[@]}"
}
src_install() {
default
insinto /etc
doins syslog.conf
keepdir /etc/syslog.d
newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
if use logrotate ; then
insinto /etc/logrotate.d
newins "${FILESDIR}"/sysklogd.logrotate sysklogd
sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
fi
find "${ED}" -type f -name "*.la" -delete || die
}
pkg_postinst() {
if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
elog "Starting with version 2.0 syslogd has built in log rotation"
elog "functionality that does no longer require a running cron daemon."
elog "So we no longer install any log rotation cron files for sysklogd."
fi
if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
elog "Starting with version 2.1 sysklogd no longer provides klogd."
elog "syslogd now also logs kernel messages."
fi
}

7
app-admin/tripwire/tripwire-2.4.3.7.ebuild

@ -12,13 +12,10 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="libressl selinux ssl static +tools"
IUSE="selinux ssl static +tools"
DEPEND="
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
ssl? ( dev-libs/openssl:0= )
"
RDEPEND="${DEPEND}
virtual/cron

BIN
app-antivirus/Manifest.gz

5
app-antivirus/clamav/clamav-0.103.2.ebuild

@ -12,7 +12,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux systemd test uclibc xml"
IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test uclibc xml"
REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
@ -34,8 +34,7 @@ CDEPEND="acct-group/clamav
elibc_musl? ( sys-libs/fts-standalone )
iconv? ( virtual/libiconv )
!libclamav-only? ( net-misc/curl )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
dev-libs/openssl:0=
milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
xml? ( dev-libs/libxml2 )"

BIN
app-arch/Manifest.gz

2
app-arch/bzip2/Manifest

@ -1,3 +1 @@
DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3

118
app-arch/bzip2/bzip2-1.0.6-r11.ebuild

@ -1,118 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
# (since we're building shared libs) ...
EAPI=6
inherit toolchain-funcs multilib-minimal usr-ldscript
DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
HOMEPAGE="https://sourceware.org/bzip2/"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static static-libs"
PATCHES=(
"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
"${FILESDIR}"/${PN}-1.0.6-saneso.patch
"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
"${FILESDIR}"/${PN}-1.0.6-progress.patch
"${FILESDIR}"/${PN}-1.0.3-no-test.patch
"${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
"${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
"${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
"${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
"${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch
"${FILESDIR}"/${PN}-1.0.6-nselectors-upper-bound-check.patch
)
DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
HTML_DOCS=( manual.html )
src_prepare() {
default
# - Use right man path
# - Generate symlinks instead of hardlinks
# - pass custom variables to control libdir
sed -i \
-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
Makefile || die
}
bemake() {
emake \
VPATH="${S}" \
CC="$(tc-getCC)" \
AR="$(tc-getAR)" \
RANLIB="$(tc-getRANLIB)" \
"$@"
}
multilib_src_compile() {
bemake -f "${S}"/Makefile-libbz2_so all
# Make sure we link against the shared lib #504648
ln -s libbz2.so.${PV} libbz2.so || die
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
}
multilib_src_install() {
into /usr
# Install the shared lib manually. We install:
# .x.x.x - standard shared lib behavior
# .x.x - SONAME some distros use #338321
# .x - SONAME Gentoo uses
dolib.so libbz2.so.${PV}
local v
for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
done
use static-libs && dolib.a libbz2.a
if multilib_is_native_abi ; then
gen_usr_ldscript -a bz2
dobin bzip2recover
into /
dobin bzip2
fi
}
multilib_src_install_all() {
# `make install` doesn't cope with out-of-tree builds, nor with
# installing just non-binaries, so handle things ourselves.
insinto /usr/include
doins bzlib.h
into /usr
dobin bz{diff,grep,more}
doman *.1
dosym bzdiff /usr/bin/bzcmp
dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
dosym bzmore /usr/bin/bzless
dosym bzmore.1 /usr/share/man/man1/bzless.1
local x
for x in bunzip2 bzcat bzip2recover ; do
dosym bzip2.1 /usr/share/man/man1/${x}.1
done
for x in bz{e,f}grep ; do
dosym bzgrep /usr/bin/${x}
dosym bzgrep.1 /usr/share/man/man1/${x}.1
done
einstalldocs
# move "important" bzip2 binaries to /bin and use the shared libbz2.so
dosym bzip2 /bin/bzcat
dosym bzip2 /bin/bunzip2
}

115
app-arch/bzip2/bzip2-1.0.7-r1.ebuild

@ -1,115 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
# (since we're building shared libs) ...
EAPI=7
inherit toolchain-funcs multilib-minimal usr-ldscript
DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
HOMEPAGE="https://sourceware.org/bzip2/"
SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="static static-libs"
PATCHES=(
"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
"${FILESDIR}"/${PN}-1.0.7-saneso.patch
"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
"${FILESDIR}"/${PN}-1.0.6-progress.patch
"${FILESDIR}"/${PN}-1.0.3-no-test.patch
"${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
"${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
"${FILESDIR}"/${PN}-1.0.7-out-of-tree-build.patch
)
DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
HTML_DOCS=( manual.html )
src_prepare() {
default
# - Use right man path
# - Generate symlinks instead of hardlinks
# - pass custom variables to control libdir
sed -i \
-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
Makefile || die
}
bemake() {
emake \
VPATH="${S}" \
CC="$(tc-getCC)" \
AR="$(tc-getAR)" \
RANLIB="$(tc-getRANLIB)" \
"$@"
}
multilib_src_compile() {
bemake -f "${S}"/Makefile-libbz2_so all
# Make sure we link against the shared lib #504648
ln -s libbz2.so.${PV} libbz2.so || die
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
}
multilib_src_install() {
into /usr
# Install the shared lib manually. We install:
# .x.x.x - standard shared lib behavior
# .x.x - SONAME some distros use #338321
# .x - SONAME Gentoo uses
dolib.so libbz2.so.${PV}
local v
for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
done
use static-libs && dolib.a libbz2.a
if multilib_is_native_abi ; then
gen_usr_ldscript -a bz2
dobin bzip2recover
into /
dobin bzip2
fi
}
multilib_src_install_all() {
# `make install` doesn't cope with out-of-tree builds, nor with
# installing just non-binaries, so handle things ourselves.
insinto /usr/include
doins bzlib.h
into /usr
dobin bz{diff,grep,more}
doman *.1
dosym bzdiff /usr/bin/bzcmp
dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
dosym bzmore /usr/bin/bzless
dosym bzmore.1 /usr/share/man/man1/bzless.1
local x
for x in bunzip2 bzcat bzip2recover ; do
dosym bzip2.1 /usr/share/man/man1/${x}.1
done
for x in bz{e,f}grep ; do
dosym bzgrep /usr/bin/${x}
dosym bzgrep.1 /usr/share/man/man1/${x}.1
done
einstalldocs
# move "important" bzip2 binaries to /bin and use the shared libbz2.so
dosym bzip2 /bin/bzcat
dosym bzip2 /bin/bunzip2
}

21
app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch

@ -1,21 +0,0 @@
bzgrep uses !/bin/sh but then uses the bashism ${var//} so replace those
with calls to sed so POSIX shells work
http://bugs.gentoo.org/193365
--- a/bzgrep
+++ b/bzgrep
@@ -63,10 +63,9 @@
bzip2 -cdfq "$i" | $grep $opt "$pat"
r=$?
else
- j=${i//\\/\\\\}
- j=${j//|/\\|}
- j=${j//&/\\&}
- j=`printf "%s" "$j" | tr '\n' ' '`
+ # the backslashes here are doubled up as we have to escape each one for the
+ # shell and then escape each one for the sed expression
+ j=`printf "%s" "${i}" | sed -e 's:\\\\:\\\\\\\\:g' -e 's:[|]:\\\\|:g' -e 's:[&]:\\\\&:g' | tr '\n' ' '`
bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
r=$?
fi

18
app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch

@ -1,18 +0,0 @@
Upstream-Status: Backport
https://bugzilla.suse.com/attachment.cgi?id=681334
CVE: CVE-2016-3189
Signed-off-by: Armin Kuster <akuster@mvista.com>
Index: bzip2-1.0.6/bzip2recover.c
===================================================================
--- a/bzip2recover.c
+++ b/bzip2recover.c
@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
bsPutUInt32 ( bsWr, blockCRC );
bsClose ( bsWr );
+ outFile = NULL;
}
if (wrBlock >= rbCtr) break;
wrBlock++;

27
app-arch/bzip2/files/bzip2-1.0.6-mingw.patch

@ -1,27 +0,0 @@
make it build for mingw targets
https://bugs.gentoo.org/393573
--- a/bzip2.c
+++ b/bzip2.c
@@ -129,7 +129,7 @@
#if BZ_LCCWIN32
# include <io.h>
# include <fcntl.h>
-# include <sys\stat.h>
+# include <sys/stat.h>
# define NORETURN /**/
# define PATH_SEP '\\'
--- a/bzlib.h
+++ b/bzlib.h
@@ -81,6 +81,9 @@ typedef
/* windows.h define small to char */
# undef small
# endif
+# ifndef WINAPI
+# define WINAPI
+# endif
# ifdef BZ_EXPORT
# define BZ_API(func) WINAPI func
# define BZ_EXTERN extern

30
app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch

@ -1,30 +0,0 @@
From 13ca8fee0c897121ae79ae644a212418398dfea7 Mon Sep 17 00:00:00 2001
From: Amin Hassani <ahassani@chromium.org>
Date: Fri, 8 Mar 2019 09:58:20 -0800
Subject: [PATCH] Check for upper bounds of nselectors.
Currently there is no check for the upper bounds of the
nselectors. Hence, a corrupt input can cause a segfault.
This issue was discovered by one of our fuzzers. The actual error was:
../bzip2-1.0.6/decompress.c:299:10: runtime error: index 18002 out of bounds for type 'UChar [18002]'
---
decompress.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/decompress.c b/decompress.c
index 311f566..391552d 100644
--- a/decompress.c
+++ b/decompress.c
@@ -288,6 +288,7 @@ Int32 BZ2_decompress ( DState* s )
if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
+ if (nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR);
for (i = 0; i < nSelectors; i++) {
j = 0;
while (True) {
--
2.21.0.360.g471c308f928-goog

79
app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch

@ -1,79 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,6 @@ libbz2.a: $(OBJS)
check: test
test: bzip2
- @cat words1
./bzip2 -1 < sample1.ref > sample1.rb2
./bzip2 -2 < sample2.ref > sample2.rb2
./bzip2 -3 < sample3.ref > sample3.rb2
@@ -66,7 +65,6 @@ test: bzip2
cmp sample1.tst sample1.ref
cmp sample2.tst sample2.ref
cmp sample3.tst sample3.ref
- @cat words3
install: bzip2 bzip2recover
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
@@ -115,25 +113,8 @@ clean:
sample1.rb2 sample2.rb2 sample3.rb2 \
sample1.tst sample2.tst sample3.tst
-blocksort.o: blocksort.c
- @cat words0
- $(CC) $(CFLAGS) -c blocksort.c
-huffman.o: huffman.c
- $(CC) $(CFLAGS) -c huffman.c
-crctable.o: crctable.c
- $(CC) $(CFLAGS) -c crctable.c
-randtable.o: randtable.c
- $(CC) $(CFLAGS) -c randtable.c
-compress.o: compress.c
- $(CC) $(CFLAGS) -c compress.c
-decompress.o: decompress.c
- $(CC) $(CFLAGS) -c decompress.c
-bzlib.o: bzlib.c
- $(CC) $(CFLAGS) -c bzlib.c
-bzip2.o: bzip2.c
- $(CC) $(CFLAGS) -c bzip2.c
-bzip2recover.o: bzip2recover.c
- $(CC) $(CFLAGS) -c bzip2recover.c
+%.o: %.c
+ $(CC) $(CFLAGS) -c $<
distclean: clean
--- a/Makefile-libbz2_so
+++ b/Makefile-libbz2_so
@@ -36,9 +36,7 @@ OBJS= blocksort.o \
all: $(OBJS)
$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)