root
9 years ago
parent
e8e160f479
commit
bf7c6db6c4
@ -1,6 +1,6 @@
|
||||
AUX mcollectived.initd 503 SHA256 6d25d3c07f516cae79b9797abbb6b1e90df4909ca59a01a6a6801e5c0a310939 SHA512 900aac6268a3b3a4889a7aa78587c3ff3a51c2054153747bf9522081e7ceab111619743ccfb2e0e25bfd8fad4b6d5781b9522ac1e31973b1a7623fcdc2dc86fa WHIRLPOOL 43a9aacf1f5a7181dba84323910dff0b1286c9700f1cfd2a68ea2120b78e3307dc5a0425172a3a0606e8ef2195dee40554384d660c2aaa8886ac51bb4e364458
|
||||
DIST mcollective-2.8.0.tar.gz 718292 SHA256 47084f9285707f2e457850adcf90811f3d39d4f4baa950d822b20b45633db259 SHA512 edc3da334dbd3afd18fcedc675c6498edce1c799d9b472f70ebfe1b972e013cba5217ec492ea4128b15d886edaf283246ba70915180f9a10a67f7c0957fd1c8e WHIRLPOOL 0c6461a43c4533334dee420e7a0debfa8aa2e0079b83407c1313a28689b5ecbd891c94740553947bdce4023786eb0e95e497da73108e283619f358d67dac7c0c
|
||||
EBUILD mcollective-2.8.0.ebuild 1524 SHA256 c9ee481e194eae3924308f9a92154714f688fd254fec1e739fd95d9e26ccb6a9 SHA512 21afc38a84a890d3769c57ba908e93b7385a6986ffc9e8450cf8e6bee25a7e9d272f537317e9ff3bee1c9cd9734f0372fe4cc932cb07ca62a4ecc8061918ae6a WHIRLPOOL 73937f924e3df1562784668cef092ed6160d3b113d644d2997a1f33773069fc43c37a5fd243af60b7e5eaa865ca6af9ad61664ef8e1d6b8b3b095e393dc027f1
|
||||
EBUILD mcollective-2.8.0.ebuild 1517 SHA256 1e4f20dd8daf9a8a8797b1d2214e800f0f5e347d93d6b82861ac4694a30a0632 SHA512 6eac7afa015d3e863f38ca0de0fbb9d5ac9c7d85b534ea6907ca30a65fd5a018c6a9ee1e26af39f180dce734fb85a76def56de2ecafadc6e4647f4ac1b3a9cd1 WHIRLPOOL dd2dbfbbd20936e726868cff370d7cd0c0953a10fc1c8f19829c5c7446a0108d4bbea4e5c63e2d86dab05e978196d87e69ed75d6a27bc92ef1a63eb1ecbfa5f1
|
||||
MISC ChangeLog 2375 SHA256 ae4c93ae23ae6161950b9b9cb56833d59c7b5e3c096efe9a8aff347cb99c45c3 SHA512 6e8a2d3db22cdfb94587ce3f137361e7c6b21e8035da05ca2ffd98472d58a99607921462fcd3309bba8df3df4fbbada6c4e46c25e5a38cd72cee5dab137903f7 WHIRLPOOL d5c33c41c09b87fef15f5452e15ba7beba8c4df21ab55153fe11aa0ad7bd5fb20b9fdc21df866dd7c07b1c072bc041a975bef0dd1bf47675b92438269904b5d1
|
||||
MISC ChangeLog-2015 4747 SHA256 1555e32b0cce5896f5aa1dc96dbfab9ee18005ca9861412adc257970943236c5 SHA512 588921e55eae4d4e2c5af0bdc1f5dcc1c5fdc75e1afa00505e71dac184015213f613151d82012c781e0206553e8ed24641daf569b3a31280efb3420ea1ad0607 WHIRLPOOL 7ffc8e316e46570275c026a87bc20a53c0e05819d5bb491b6072dc159593806b4bbdef069c48c3ad004cc266f110edf3a5318105961e4955c6ff36979c49b922
|
||||
MISC metadata.xml 437 SHA256 f3e559ca423428ee5a0dfd080c327a894514c3dcc5129f780b9e840d9eded6c2 SHA512 56f2fef4d7bb3bad9ffbb0f51c9a9580b1cbe71e8ec523726e2776178f92102d3153341f792b079410c3867f304097a83ca21fda95a3021aac786235ab3bc165 WHIRLPOOL 6b9c474b4be51aaa8c14c5fc7be1695b7f86d8f3163ecf1a6216b6a344dace3ff5c77367ee5bb24cf2fbefaeaadb05a92e94c7acf35fd852b1df791a92aed0eb
|
||||
|
||||
@ -1,12 +1,9 @@
|
||||
AUX gentoo-setup 13375 SHA256 9a97a1d09258feb0715a18c17746d1e62b74371ea8141553fce9d4f24cc181e4 SHA512 788ef6e1c3e91362c92a48639234262177050fbdacaeb3b567ed9b2f4f7e6203451a3ed7a989b50188f7e4b4a6ee3401341dedca453480562d7af69a73e67c4b WHIRLPOOL 510f42b5c7fbf7c5b0a8e15b1453530d6c9e61185b3fa82b867a5548e13453d9019ede5d58f1296f597ce2033727374c5ad1aeae8dd97af494c8f3fdf622e4cd
|
||||
AUX gentoo-setup-1.791 13727 SHA256 91e011867005dcea7cf971c36e93f6eb3a3d7626a5ecee07ce2fa4525e3ebdff SHA512 fa6fde84eb9a16fea5d019fd920aed2a2f5dd51e5f32fa407fd1c424a0627eaafab7cd3b572a57e4f97e06ce5b6b5a7373ac377776a474a8512e077130eadc6e WHIRLPOOL 93eca248ba35d30ca9e00d7f9a9b5d1ac4d71c97bef7002fd745121c4c2e061322f980efd6674b0817368154d47096d8b810a7d17cf8514493e1635d7310a701
|
||||
AUX init.d.webmin 2166 SHA256 e2ee80dd57b0071bb642462e5fb50dc4b35a9e66f861498ffb677abfddcdfdfe SHA512 e65ebb9d05a49dd184371a1f8f534b7530a1791f87d6bd0e37ae23d277c28e8d40ad067890fa67b1d0fef4965cf091a55e17f34b1c324690229721d0ed911491 WHIRLPOOL e9b5c0bcfd9c07d6115f127fed71d97bc74f8c4d396c730c36a8c549ad4c8e89a65ca7df321dc8918c0e8ed79f00a30b9942497fdb1a773904e489010f16b807
|
||||
AUX webmin.service 416 SHA256 f5e9301ad853929e15cb4c4860f8d3da5a27036bcaebce38a32ec81da798b8ef SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e WHIRLPOOL 9d4fbe570364a94516cf5f66eb968209f9731b6a1f3083071f3c299d65c28559e35dd76ca7e2ac2f3e5381b854cb8b5a561c48388b761c3dbb4d57829c59520b
|
||||
DIST webmin-1.770-minimal.tar.gz 2612198 SHA256 e976091dcf0a68dfb02d5633d09da2ce9dc69d8ea2bde95c3cc57a0a25384488 SHA512 3661e37bbeb9f814862ff208d32ec4bfa15e8e826c15833e47c3a39cb0bb47d1f227c0c942f72aed4f3e9344556cc0ef8de42a5961c6795ef01986abafe9949b WHIRLPOOL 92a89623da8ba09d921ffec38c45c2c4bf04c8249178d9d13d34339ecc902d8d7184396ce29c04bfb6e9eba463c2942dc5d9d10d05af463b4dbf9337891bcc02
|
||||
DIST webmin-1.770.tar.gz 28441983 SHA256 eb84f1adbb099d0a2e633fbc4ea4838d1ddbcc84135d6a897803fbd0284719ba SHA512 460d9e06379df8d950874906589938077fd0fc70ed12948a685c1386c9995538d92387e252373398319469406b8ef0daab67dabe8c71b2f1961a5d5cb6848a7f WHIRLPOOL 4556f51001d010b66c6af265904b3f634f7bccf1afeb74be6de0824fefb2a5b2a5508d751bfa4abcfd0cb8b670659474ecf4e564505e446ed36a737e4f100dc0
|
||||
DIST webmin-1.780-minimal.tar.gz 2624841 SHA256 d4f51fcc448a881d568a32dce1712f4feb1d15bccb05005117179b8a6488e403 SHA512 a0fc61c202d94419f52572a95df23f4dd54c3b0552ce96df356b13b529988cb4be02e5f1165fbd5fbe30921697baac8b229d8d587860e3adabcbe2a4bfb11806 WHIRLPOOL f8b94e16b041cef115cfa7a49fbb34d432f9f96b28959e3f161df9de5805d4a38d7a019479e96ee886dd6f4c21e5884864a69b923ec3b0ac92422c530a95249c
|
||||
DIST webmin-1.780.tar.gz 28578888 SHA256 eb2613a4f4525cbbd04435580a843cb2a454bcf2712301105657cc114beda40e SHA512 1d5552fc09e0a42218881d2d028b8e73deadfca36022a6212e540e8dbbd2ff5fe23883fc4d3b4d63abee0a2aee570ce9710e4e1b75c2cc28f70724502d6680d7 WHIRLPOOL 7ef76b9e3f64d01978aa281d7e57db37078bab4ec101faa115f51ebf43bc0823d8a8bfa925dff5d1a39b0b9aabdada2218d543b14d3961b1346de05c46137d4b
|
||||
EBUILD webmin-1.770.ebuild 10290 SHA256 913320e253cfc189f5c32f12e18fa613d326ed2f1a39bb984aa2e9b9096e6a56 SHA512 e32a78727e7ab5c46f851578ac321fdde77b8d5b90ecd239e2df8602d5fc270cb99367e435ad1e4a75876dfc6f7b49a2a3935273b3549025758f500682cfff52 WHIRLPOOL 82ad5163473dd86459ed38636e7e763142db3b3b65ca80d0e8abbb729f20787d9ba89a8b1beeedec40b8232006f15d22bff79425292b43ba48bebe6100583222
|
||||
EBUILD webmin-1.780.ebuild 10290 SHA256 913320e253cfc189f5c32f12e18fa613d326ed2f1a39bb984aa2e9b9096e6a56 SHA512 e32a78727e7ab5c46f851578ac321fdde77b8d5b90ecd239e2df8602d5fc270cb99367e435ad1e4a75876dfc6f7b49a2a3935273b3549025758f500682cfff52 WHIRLPOOL 82ad5163473dd86459ed38636e7e763142db3b3b65ca80d0e8abbb729f20787d9ba89a8b1beeedec40b8232006f15d22bff79425292b43ba48bebe6100583222
|
||||
MISC ChangeLog 3646 SHA256 a9a5d39e0e9f20d22d8885b05e803bf86f01871367136414acf037acfca32eda SHA512 04b5d421c441acae84b865c13b9ef45d62eb155a78adf1147aab34d8539b53ddbca336b3248c36830f03502cc2dd3a1381ba90dc0a4892525ba73bb323c78fcc WHIRLPOOL 8190ffdd545124d702da36d4d15a5393b01823852ce0c1a810f8f2b28e5c1e3ac974222186e2011abe4e1132c36c59809fbea4f2bbb94ee341b979017ff66e17
|
||||
DIST webmin-1.791-minimal.tar.gz 2635024 SHA256 d269fcccf0034edff44654fb40b83f63e3274f722a8f0d5b14f1fa9f74f49b00 SHA512 e8e7b43865399e918ef017d4d710b21cc7ce2f6566056faa82d756be29f038e07a20055978531f8785639c78339970fbfeabd4a4aa1fa4b331f3a344a78954d2 WHIRLPOOL e8380478edf6b994e03623a9a6b84f736a6c5efd1dbe0aac3905f85457d172a783af0231d4b3606d69c63129c4c4d3d80fa10608dd47374a01f45be7fd53b281
|
||||
DIST webmin-1.791.tar.gz 28800013 SHA256 e62148a2263c016a66e7c825c5cb124614268c1da1e0f0bee75cd060c3acfa9c SHA512 4ba19f057ee70bc0a283753a6c190bbae15f0e2af1650ef1656c7b94e07a6750203ef3b7190f7abd544b25988446df6b174bf06191426893bd4224e54451e771 WHIRLPOOL 2d739e1c3ba06b04086b7d20eb646f950aa8776b4fc41bc975cb160733e70a5c7a4de6f331c294bf168e3f8fd5009c72d617eab662078f6d901087b3cfc2db36
|
||||
EBUILD webmin-1.791.ebuild 10402 SHA256 53171006a89b3881d1a44ee229aa44c08a9b8c4c5c77628f64c39bf4d22cd8bc SHA512 c431baf7f05770d4de9d076b4170f1d45f1bed83824484c08a8412fefc68607d675500d3abac9627abf9d8982f1965c33b7ea6e12373fb426e6a1197f7d349f8 WHIRLPOOL 8ae0781267d2281c2840c1b292d029ce89ac86f765f8c0bc7b9e8a761944e7b327ec95b8e64ac070459b2b25c6ffabb643e469a0c557810ca694ba01f88f8ed9
|
||||
MISC ChangeLog 4301 SHA256 a182bf0d39bb5e34f60be2d9559563cc570e552c6a57d991785fbd61617044b8 SHA512 85f40216483284e655decdb37a10dce13b6a83c269556a43699d338fb3da011262bfb92d7b838b06b4577f6e924e5bf4a91f7a5b530c7068d695996798c88ae3 WHIRLPOOL ff86bd8fe8d1a2bb7020aa65b546a06909befe629bdada33f515f04a6d9abb96fdd87300eecb95d5fbcb9e01a3e74a5816fb96ae411ed8ebb2835048019eee84
|
||||
MISC ChangeLog-2015 4254 SHA256 efa22131b44fe313a9fd5a7e4fbd909e6d35c6c4611f1efcb2300a2da97a4a54 SHA512 8836feee09cf4bf9c9dea1ace319e61966de8c12a756a7fbd852ebe009a3cf6bda31a1643d4a1fcc1e70b26f056c2ca8ddb3f3706cba96c144c79f824716f790 WHIRLPOOL c19dd95150a439595aad92a7d6fa0878402338f85fbd1561cf09518e75586f8a85738d13d30cb68fe509fb622d19c8d7109e17510b15b83802ee8969246504b9
|
||||
MISC metadata.xml 503 SHA256 0d5c5ecb4c18481f38f311a69bd8f1cd4a47d3b9058d488e1406ac34f5e39f06 SHA512 e8a986cc46ad8e970db4571a20b7a8432fa4640fa8a032abdeb2176ee3a08f8f4da65da41105f788ab47b60b981f7607a1d5228f6b6db1757d3f897d0832d75b WHIRLPOOL b6e26eeb7ed30a9a1b7d0ebf5819f6a8cbdd4fa878523d6d2108d1e7aa825d5bdee0d3be8cbd5727de65e509ce184dd8bc343700a483c5ed08ab753f306ca10f
|
||||
|
||||
@ -1,307 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils pam ssl-cert systemd
|
||||
|
||||
DESCRIPTION="A web-based Unix systems administration interface"
|
||||
HOMEPAGE="http://www.webmin.com/"
|
||||
SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
|
||||
!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
|
||||
|
||||
LICENSE="BSD GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
|
||||
# because openssl is forced by dev-perl/Net-SSLeay
|
||||
IUSE="minimal +ssl mysql postgres ldap"
|
||||
|
||||
# All the required perl modules can be found easily using (in Webmin's root src dir):
|
||||
# find . -name cpan_modules.pl -exec grep "::" {} \;
|
||||
# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
|
||||
# to install them using the in-built cpan module, and this will mess up perl on the system
|
||||
# That's why some modules are forced without a use flag
|
||||
# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
|
||||
DEPEND="virtual/perl-MIME-Base64
|
||||
virtual/perl-Socket
|
||||
virtual/perl-Sys-Syslog
|
||||
virtual/perl-Time-HiRes
|
||||
virtual/perl-Time-Local
|
||||
dev-perl/Authen-Libwrap
|
||||
dev-perl/IO-Tty
|
||||
dev-perl/MD5
|
||||
dev-perl/Net-SSLeay
|
||||
dev-perl/Authen-PAM
|
||||
dev-perl/Sys-Hostname-Long
|
||||
>=net-dns/dnssec-tools-1.13
|
||||
!minimal? (
|
||||
mysql? ( dev-perl/DBD-mysql )
|
||||
postgres? ( dev-perl/DBD-Pg )
|
||||
ldap? ( dev-perl/perl-ldap )
|
||||
dev-perl/XML-Generator
|
||||
dev-perl/XML-Parser
|
||||
)"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
local perl="$( which perl )"
|
||||
|
||||
# Remove the unnecessary and incompatible files
|
||||
rm -rf acl/Authen-SolarisRBAC-0.1*
|
||||
if ! use minimal ; then
|
||||
rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
|
||||
rm -f mount/{free,net,open}bsd-mounts*
|
||||
rm -f mount/macos-mounts*
|
||||
fi
|
||||
|
||||
# For security reasons remove the SSL certificate that comes with Webmin
|
||||
# We will create our own later
|
||||
rm -f miniserv.pem
|
||||
|
||||
# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
|
||||
# We will use our own later
|
||||
rm -f setup.{sh,pl}
|
||||
|
||||
# Set the installation type/mode to Gentoo
|
||||
echo "gentoo" > install-type
|
||||
|
||||
# Fix the permissions of the install files
|
||||
chmod -R og-w "${S}"
|
||||
|
||||
# Since we should not modify any files after install
|
||||
# we set the perl path in all cgi and pl files here using Webmin's routines
|
||||
# The pl file is Prefix safe and works only on provided input, no other filesystem files
|
||||
ebegin "Fixing perl path in source files"
|
||||
(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Create config dir and keep
|
||||
diropts -m0755
|
||||
dodir /etc/webmin
|
||||
keepdir /etc/webmin
|
||||
|
||||
# Create install dir
|
||||
# Third party modules installed through Webmin go here too, so keep
|
||||
dodir /usr/libexec/webmin
|
||||
keepdir /usr/libexec/webmin
|
||||
|
||||
# Copy our own setup script to installation folder
|
||||
insinto /usr/libexec/webmin
|
||||
newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
|
||||
fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
|
||||
|
||||
# This is here if we ever want in future ebuilds to add some specific
|
||||
# config values in the /etc/webmin/miniserv.conf
|
||||
# The format of this file should be the same as the one of miniserv.conf:
|
||||
# var=value
|
||||
#
|
||||
# Uncomment it if you use such file. Before that check if upstream
|
||||
# has this file in root dir too.
|
||||
#newins "${FILESDIR}/miniserv-conf" miniserv-conf
|
||||
|
||||
# Create the log dir and keep
|
||||
diropts -m0700
|
||||
dodir /var/log/webmin
|
||||
keepdir /var/log/webmin
|
||||
|
||||
# Create the init.d file and put the neccessary variables there
|
||||
newinitd "${FILESDIR}"/init.d.webmin webmin
|
||||
sed -i \
|
||||
-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
|
||||
-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
|
||||
-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
|
||||
-e "s:%config%:${EROOT}etc/webmin/config:" \
|
||||
-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
|
||||
"${ED}etc/init.d/webmin" \
|
||||
|| die "Failed to patch the webmin init file"
|
||||
|
||||
# Create the systemd service file and put the neccessary variables there
|
||||
systemd_newunit "${FILESDIR}"/webmin.service webmin.service
|
||||
sed -i \
|
||||
-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
|
||||
-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
|
||||
-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
|
||||
-e "s:%config%:${EROOT}etc/webmin/config:" \
|
||||
-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
|
||||
"${ED}$(_systemd_get_systemunitdir)/webmin.service" \
|
||||
|| die "Failed to patch the webmin systemd service file"
|
||||
|
||||
# Setup pam
|
||||
pamd_mimic system-auth webmin auth account session
|
||||
|
||||
# Copy files to installation folder
|
||||
ebegin "Copying install files to destination"
|
||||
cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
|
||||
eend $?
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# First stop service if running so Webmin to not messup our config
|
||||
ebegin "Stopping any running Webmin instance prior merging"
|
||||
if systemd_is_booted ; then
|
||||
systemctl stop webmin.service 2>/dev/null
|
||||
else
|
||||
rc-service --ifexists -- webmin --ifstarted stop
|
||||
fi
|
||||
eend $?
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Run pkg_config phase first - non interactively
|
||||
export INTERACTIVE="no"
|
||||
pkg_config
|
||||
# Every next time pkg_config should be interactive
|
||||
INTERACTIVE="yes"
|
||||
|
||||
ewarn
|
||||
ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
|
||||
ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
|
||||
ewarn "To avoid problems, please before using any module, look at its configuration options first."
|
||||
ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
|
||||
ewarn
|
||||
if systemd_is_booted ; then
|
||||
elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
|
||||
else
|
||||
elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
|
||||
fi
|
||||
elog "- The default URL to connect to Webmin is: https://localhost:10000"
|
||||
elog "- The default user that can login is: root"
|
||||
elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# First stop service if running - we do not want Webmin to mess up config
|
||||
ebegin "Stopping any running Webmin instance prior unmerging"
|
||||
if systemd_is_booted ; then
|
||||
systemctl stop webmin.service 2>/dev/null
|
||||
else
|
||||
rc-service --ifexists -- webmin --ifstarted stop
|
||||
fi
|
||||
eend $?
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# If removing webmin completely, remind the user for the Webmin's own cron jobs.
|
||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
||||
ewarn
|
||||
ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
|
||||
ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
|
||||
ewarn "To fix this just disable them if you intend to use Webmin again,"
|
||||
ewarn "OR delete them if not."
|
||||
ewarn
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_config(){
|
||||
# First stop service if running
|
||||
ebegin "Stopping any running Webmin instance"
|
||||
if systemd_is_booted ; then
|
||||
systemctl stop webmin.service 2>/dev/null
|
||||
else
|
||||
rc-service --ifexists -- webmin --ifstarted stop
|
||||
fi
|
||||
eend $?
|
||||
|
||||
# Next set the default reset variable to 'none'
|
||||
# reset/_reset can be:
|
||||
# 'none' - does not reset anything, just upgrades if a conf is present
|
||||
# OR installs new conf if a conf is missing
|
||||
# 'soft' - deletes only $config_dir/config file and thus resetting most
|
||||
# conf values to their defaults. Keeps the specific Webmin cron jobs
|
||||
# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
|
||||
# and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
|
||||
local _reset="none"
|
||||
|
||||
# If in interactive mode ask user what should we do
|
||||
if [[ "${INTERACTIVE}" = "yes" ]]; then
|
||||
einfo
|
||||
einfo "Please enter the number of the action you would like to perform?"
|
||||
einfo
|
||||
einfo "1. Update configuration"
|
||||
einfo " (keeps old config options and adds the new ones)"
|
||||
einfo "2. Soft reset configuration"
|
||||
einfo " (keeps some old config options, the other options are set to default)"
|
||||
ewarn " All Webmin users will be reset"
|
||||
einfo "3. Hard reset configuration"
|
||||
einfo " (all options including module options are set to default)"
|
||||
ewarn " You will lose all Webmin configuration options you have done till now"
|
||||
einfo "4. Exit this configuration utility (default)"
|
||||
while [ "$correct" != "true" ] ; do
|
||||
read answer
|
||||
if [[ "$answer" = "1" ]] ; then
|
||||
_reset="none"
|
||||
correct="true"
|
||||
elif [[ "$answer" = "2" ]] ; then
|
||||
_reset="soft"
|
||||
correct="true"
|
||||
elif [[ "$answer" = "3" ]] ; then
|
||||
_reset="hard"
|
||||
correct="true"
|
||||
elif [ "$answer" = "4" -o "$answer" = "" ] ; then
|
||||
die "User aborted configuration."
|
||||
else
|
||||
echo "Answer not recognized. Enter a number from 1 to 4"
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ "$_reset" = "hard" ]]; then
|
||||
while [ "$sure" != "true" ] ; do
|
||||
ewarn "You will lose all Webmin configuration options you have done till now."
|
||||
ewarn "Are you sure you want to do this? (y/n)"
|
||||
read answer
|
||||
if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
|
||||
sure="true"
|
||||
elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
|
||||
die "User aborted configuration."
|
||||
else
|
||||
echo "Answer not recognized. Enter 'y' or 'n'"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
export reset=$_reset
|
||||
|
||||
# Create ssl certificate for Webmin if there is not one in the proper place
|
||||
if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
|
||||
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
|
||||
SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
|
||||
install_cert "${EROOT}/etc/ssl/webmin/server"
|
||||
fi
|
||||
|
||||
# Ensure all paths passed to the setup script use EROOT
|
||||
export wadir="${EROOT}usr/libexec/webmin"
|
||||
export config_dir="${EROOT}etc/webmin"
|
||||
export var_dir="${EROOT}var/log/webmin"
|
||||
export tempdir="${T}"
|
||||
export pidfile="${EROOT}var/run/webmin.pid"
|
||||
export perl="$( which perl )"
|
||||
export os_type='gentoo-linux'
|
||||
export os_version='*'
|
||||
export real_os_type='Gentoo Linux'
|
||||
export real_os_version='Any version'
|
||||
# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
|
||||
# 'no_tls1' and 'no_tls1_1' for tightening security
|
||||
export ssl=1
|
||||
export no_ssl2=1
|
||||
export no_ssl3=1
|
||||
export ssl_redirect=1
|
||||
export no_sslcompression=1
|
||||
export no_tls1=1
|
||||
export no_tls1_1=1
|
||||
export keyfile="${EROOT}etc/ssl/webmin/server.pem"
|
||||
export port=10000
|
||||
|
||||
export atboot=0
|
||||
|
||||
einfo "Executing Webmin's configure script"
|
||||
$wadir/gentoo-setup.sh
|
||||
|
||||
einfo "Configuration of Webmin done"
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
DIST borgbackup-1.0.0.tar.gz 424089 SHA256 500b9e311331aa88ec07df94d9f3280a79ca207bf1a997b92dd1e6a1f1664671 SHA512 5a94f1b0dfe17d383bcc917db69ed272b9b752b96912a21ac62886972cdbd718b58fe3f9529af455ab325ba418cfc05b89985e32a23fed5e946c5f7e53e6e3b1 WHIRLPOOL c0a5c40aff70c9872e62861a0e971f659191f3a99112dfe940db2440666def3a04af284f5f31ccaef410c7028a49377df96fb38fd462917ad11cd095e33b12e9
|
||||
EBUILD borgbackup-1.0.0.ebuild 826 SHA256 027bcfd1010c23df8883c180ff021a90745cf46edc1b105c02cfc1ee183de9c3 SHA512 28f55e49dcb9be1e8897ebed2b7dfbe98f9f0ea3a65a31e0e4be5880442b67924cf9c4a1c3a242e2e85669b48299aab2b0fd46686621ab261f40253f8ca1d7f6 WHIRLPOOL 341f2ce37afe9f93ffa7a5ad56e7094aa99f394f391d80b4008dd957b04592514f785363a13cc9f54238d3a855fe785d7e260eb9d0c00cea067818197cba3c89
|
||||
EBUILD borgbackup-9999.ebuild 826 SHA256 027bcfd1010c23df8883c180ff021a90745cf46edc1b105c02cfc1ee183de9c3 SHA512 28f55e49dcb9be1e8897ebed2b7dfbe98f9f0ea3a65a31e0e4be5880442b67924cf9c4a1c3a242e2e85669b48299aab2b0fd46686621ab261f40253f8ca1d7f6 WHIRLPOOL 341f2ce37afe9f93ffa7a5ad56e7094aa99f394f391d80b4008dd957b04592514f785363a13cc9f54238d3a855fe785d7e260eb9d0c00cea067818197cba3c89
|
||||
MISC metadata.xml 410 SHA256 e0e26dcdf8e3132f3e897a11b93a7670ba5de8be57770e3d981763e85273f138 SHA512 0c84306be893e2c179f8a83013d20b3d351ebe0d89bd931a36ef70ed934f06507bda2fd2bae04e583d17a8842a562b4d69b7f8b267ee6a06d228e0e8760bdff1 WHIRLPOOL d635aa5ab53fe28714857821872e86c973a4c23f5c1257d286ea580d98f78c23b0a4d4ab61d6bde129b2bb8ac4e2056cf755ca7eb3b7976c064db7a615cdd405
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python3_4 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/borgbackup/borg.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="mirror://pypi/b/borgbackup/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Deduplicating backup program with compression and authenticated encryption."
|
||||
HOMEPAGE="https://borgbackup.github.io/"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="libressl +fuse"
|
||||
|
||||
RDEPEND="
|
||||
app-arch/lz4
|
||||
dev-python/msgpack[${PYTHON_USEDEP}]
|
||||
!libressl? ( dev-libs/openssl:0 )
|
||||
libressl? ( dev-libs/libressl )
|
||||
fuse? ( dev-python/llfuse[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
dev-python/setuptools_scm[${PYTHON_USEDEP}]
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
${RDEPEND}
|
||||
"
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python3_4 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/borgbackup/borg.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="mirror://pypi/b/borgbackup/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Deduplicating backup program with compression and authenticated encryption."
|
||||
HOMEPAGE="https://borgbackup.github.io/"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="libressl +fuse"
|
||||
|
||||
RDEPEND="
|
||||
app-arch/lz4
|
||||
dev-python/msgpack[${PYTHON_USEDEP}]
|
||||
!libressl? ( dev-libs/openssl:0 )
|
||||
libressl? ( dev-libs/libressl )
|
||||
fuse? ( dev-python/llfuse[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
dev-python/setuptools_scm[${PYTHON_USEDEP}]
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
${RDEPEND}
|
||||
"
|
||||
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>blueness@gentoo.org</email>
|
||||
<name>Anthony G. Basile</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="fuse">Mount archive as a FUSE filesystem.</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">borgbackup/borg</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -1,6 +1,6 @@
|
||||
AUX master.conf.example 639 SHA256 152e482a3d02a3d33d062a926f3112cd5cd2115f7553096ea9d494c2538f9fd1 SHA512 37107271ce39de9aa744e31c1abff9871eb3e58ac48e9c6470abea2742783aeedcc4dd5a698b74f83cfa23a987a3d97dee260502d883367e707edef6b99f636a WHIRLPOOL 2d78a859d42cf116f0e9dffdd42d7443361e20db9764399e2a8c4bf732abae046dc3764ddac2ee0c4dfa62f931ab401759c804eb3e055b56f3c982fb783ec282
|
||||
DIST dirvish-1.2.1.tgz 49132 SHA256 d6068b0644f9302fb1ec676928f60145877ac316b5aa29d5a5a0204c59935527 SHA512 3618d4e73a19ed9bffa1d68561292f8d61948ab914cf0503771fe6f058af52d02707caaf73ef8b06ddbbeef72817712ab0312c3ab086f8da036c02c1fa22d0a4 WHIRLPOOL 0b82535d5aaf7893308e25af1be07c55c8b2edabe8828d4c2396ef9ca0e7e9b6a568cee6eec31dcc18703a2db7eac22cdf8bbd177605b0e410adf51d1a9bf315
|
||||
EBUILD dirvish-1.2.1.ebuild 925 SHA256 76f227ba33ebf081fe668c4e6f5da8233123068294656c2487bcf2036798d90f SHA512 0acc97b9527240166522e0ae6abb69d789aa8a6455363ffac97e8f3b6e5369ee3319fbc0ad9f633c53578d302c1eddd485f51c609f1143aac673b8d719e9c5e2 WHIRLPOOL 0f5a66730984da786e27b2f661c368c7301f37b30156bcbfb7f5eab4eb57586f6b9d444446e9bbe0e19a0dbb75ecd8c7bec3fffb70f5210bc96afc0d6c018413
|
||||
MISC ChangeLog 2486 SHA256 2f0ea1c3de2aa1fa10dfa18514843a371e491c3aeef6dcbc8180fc03962ef7ac SHA512 3a69cd7605ea74887f4f6a13d0aa4835b1f1d1073f06c336b875cabd731ef95eed1670a49b8e9b1681da31c020d9383705d8fd654650b23376f1e30d56df5d67 WHIRLPOOL 80eb313bd2bfd0e224e3d44ab0218878a8fc1d89efb7b105db950f6bf6ef4ed141225736857d7f86e96106af902fa06476145bd05f2a130c0c185989de30d2a9
|
||||
EBUILD dirvish-1.2.1.ebuild 930 SHA256 f07823a92ce4d979c3f0ba5a5f6e432ae4eacdc6c27a1450cb44a52bcd927f1c SHA512 61cd18c0c64255b13884768afdddd103f6b310a91f5c1cf5fbe8926e60712c3bb88b75593a9737578b40f2e33be93228ab8d4e364c6f8964f6fb5e2417aedc04 WHIRLPOOL fd36654e191168024715295626001a208558996bd0760994ef3a401683eb00b4f22bc1eef1314c18854ac08f832568b5b37ac90071e1987cbe0d571cbaa969b0
|
||||
MISC ChangeLog 2642 SHA256 ff8afb0506923f14ebdaf6559303ca1af63636d7431ede244c8c55c8ad1e5e30 SHA512 9213d0251fd70f627e12cd3a4b5151637824ebb0b18e9bc439f663606400f82123fb5f4ef08d180468b5a2e35904c821b527e56506b99ed13ae80455caaec280 WHIRLPOOL c6649e5eb291b21882d35b8b9908c0042d4024e5fce3344d37919b3b7e3636f6d3c6a43d94fcc4010264916296d9016e8c2427691d8475af8e83d8fa67d493c7
|
||||
MISC ChangeLog-2015 1698 SHA256 0d37aa53b9a5716826dce73b7c91b5b6a9578431cc1ec37aff65533c0d21ea13 SHA512 0ce97bb2deaa313b3b23d2f14b371c57e7987864029927313d89eb02a2a4d833bdafda82bc486460a31740d26f96a6a0e4f8224388cd6edcf6732fbf749bfcf2 WHIRLPOOL d48c970c22f9e72593d9476c0e6ad810dc82284c37ed203906c2ac84f8c21ddd98a6e66aa0ddacea437ffe54fb29c2582abe535a1180ddaf13bf5e6f47cd9b81
|
||||
MISC metadata.xml 463 SHA256 21035ed1068b5428c3b618762e3183a39a9ba5612a5f0cc3584fb74e3c7d3d16 SHA512 924bc0fcb516c7a91c81e36bb32423d82e08c255aa4a3f16a8df649720b9f14641877ad3cbd3dc1862b1c5f0df19d30b85c4aab4ff41d34dc4586137cd235475 WHIRLPOOL d019fc4486a244047d48af111c9a0e2704c260e5009a643671b5b114d8fd3fd498cadf4abcf8c3b98206d28bb1a8e764bdd1d29a6012f3d73db5cc7192313cc0
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Hard drive bottleneck testing benchmark suite"
|
||||
HOMEPAGE="http://www.coker.com.au/bonnie++/"
|
||||
SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="debug"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
# hmm?
|
||||
S="${WORKDIR}/${P}.1"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-1.96-compile-flags.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with debug) \
|
||||
--disable-stripping \
|
||||
|| die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
emake zcav || die "emake zcav failed" # see #9073
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dosbin bonnie++ zcav || die
|
||||
dobin bon_csv2html bon_csv2txt || die
|
||||
doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
|
||||
dohtml readme.html
|
||||
dodoc changelog.txt credits.txt
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
AUX linux-port.patch 10777 SHA256 9dbe27de791428350693b2e506585f2aab76a15a4be07e7544f8ca46e3f526ac SHA512 bb5ead798860f106549b73d673399f0e2c6312f8705fc5e94d7a274a154c45d4e3bbd9999f2087236e501b41a96ac1009e94bf6590f1dabe25921740b57d383c WHIRLPOOL eca128fdf0a625529ac36faafa13d5c3d6def990736697ac572d8574bed0513235e9982c2ed77288416fffa175df69375bf3f91c0def92c0d86df991509f1eb7
|
||||
AUX filebench-fix-automagic-libtecla-dependency.patch 1088 SHA256 71fed7d911228aa38458e7be94a20bc1ef98890bcaec1cda1e409a4bdd85b3ce SHA512 8c04b18d77749757bb98718ddc086637c9f541c48a2651e28b0d48586d4794feaa86eff1dafbe0c2c93bfe7ac2d090ab8fb38216f5999152309118ff3247b35d WHIRLPOOL 77379d8ce1816d13571899e3beda83a51567f90fa7df822b17736a0f933e8f6d2eab8f927968025224576e43d27df5ee03d32f27902bbac2af16c73efd86115b
|
||||
DIST filebench-1.4.9.1.tar.gz 349535 SHA256 a1d1516083a1d46bccf6246caf709e800e93eccf17572583343e77726b720678 SHA512 a6400aba4266fcf98e46c4824796a594adc5d5e7f9605f6e1ab01973ce448e27948991e453b186947a8d89f8603a69a3ba955edf2a1abccd2935196af7b6f0d1 WHIRLPOOL 5d5a5c1a2d9eeaaaaf14cd97725ce8ba47ed1f06e1713a6315320697a37a5b12027aa09f819c3e3b1a75cc435823d661e532e7ca319009eb928dc62a778b9bf4
|
||||
EBUILD filebench-1.4.9.1.ebuild 691 SHA256 9e76582972e2c439c9cdc21a544b2ec60abb37e1f699d8787413e2b3079c9389 SHA512 d5f5446199014415f98d3dde706cf04a2ad3373629fd03baf90412f0c5ce0b33d5c6c3e96396d4031413008ea9fd2d06009eb7ec621a57873e866c3f5bf10ad1 WHIRLPOOL f765a31697c0626efa163a8d8f786b646450aa7d9b82f670023647a89bf6b976ce016a0248dd7ca5389714c91b40ab8ff9466ce8c44eaee84bb3034106c66174
|
||||
MISC ChangeLog 2641 SHA256 a52e97c3db06865d2b92503dabef37d4fc628074830fe8620c8f7f09d847c5cc SHA512 390a0ab7ae3a2b22b40a0ee95227d2964c25dacc6095534220eacf34d047a4edf0bbbb23a627e3908c0acc4c521aff77183d99efcb6d439c70a6cc6910a52d2a WHIRLPOOL 077dfef072bf5671c9df18e5d39e4918cd8001c8b3b51cdd28ccfce36d7c04607b4d7ce72e76c40d704e42f20a0c6b7801ff23c5c92e80be990cb8c9215226d6
|
||||
EBUILD filebench-1.4.9.1-r1.ebuild 673 SHA256 50f884a387d846b5eac60b6c68ba8b914d1c4396fee6224477f463748fba0fa7 SHA512 297dbf2251b3e936ac67ac6e50be19ba5039dd0c28d3a6ba28b6609e333accef1610027627bc00889a930d6c140f3264c134c0da53e580bc45b022de409e99cc WHIRLPOOL 3d26305f411213b2d116670af8418d46ee19ae65666a48e7914adc87b2a1b41d046ff2c4565d85adc8528e26c0e3962c2ae8674170671ed51e55e1d7924233f7
|
||||
MISC ChangeLog 3975 SHA256 e5837f1fbc1e35813706ba95f282dc6102afae8ee216e656999b95b07b53094f SHA512 8556f21a1f630d175bbcdf69bb6887e6e17d2fa14089c82741e4271b93f106606539b44b2138b0543f3a3eedb0397d628cfbf8633715b8cb0bb72def29fd11a9 WHIRLPOOL f8ed420493a00864a8c5d88569b12e5f54eed2fb9df0ad6994389ccb9894dbdf12e04f3a17deb15a3ba131c3154f82ed81fcbf7afc9d8db4f6f12e9ba954236a
|
||||
MISC ChangeLog-2015 1115 SHA256 d31c61eb600917fabcd88c0f95b822cdc75b2d389a208a75e3a3eb61c01f93f5 SHA512 b69087da3b7e4f1dac44d23470b2411dfec61ccb5d19a4864aabc95e69d48090929708e32b50ed7cc640e4fdd8ea3bf96a70b566442a5f688845661284993d64 WHIRLPOOL 54b8ab0567f255ba6e588381b9074e89305234a0b5006855cc6694991a00ae058ba51b4edb08f15751db8228790caa268be4cc753b2f9e08a1f142aceebce768
|
||||
MISC metadata.xml 707 SHA256 537ad596b8537cc005b96a8adf1ae84808b55b5328a3adc26b64d29843ab6796 SHA512 f1d4b9c1f2e4260fe7c66b895b48ad577ec29d6fce05c6aa800069a3054abd26dc0311eed25b751392818f6add8d398a5905c63e574ccbdb1909800ad597875e WHIRLPOOL cf150d2b1c34e2b83c66998765685ecd134747d6d764f8ad4362f5dd5b1429ebc03698b36a026c21cf730737bc244f41a22d9dbcaab0b624679f6290e3550e8d
|
||||
MISC metadata.xml 847 SHA256 d9738b29e498533e03d0b8d43c606028f03fcbdba559f1ba19ad8dcea234fa62 SHA512 b4a781cef6f74248e441545d02a8de7ccb5bae0da11bc0d8b32a37b2a09dd0b11030631f4ce2a407e601afdd4dec52e0f3bace5b775860bd18945129eaa78250 WHIRLPOOL 9af78b6a05a6b67d6e7ed7911c93123af30dbb4af4da71b0f6266d8ec2c289b5da420782166b33625c8969dbfab86cc8c6757535a1bd84e3ef2b33ea48964d6f
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Filebench - A Model Based File System Workload Generator"
|
||||
HOMEPAGE="http://sourceforge.net/projects/filebench/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="CDDL"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="auto-completion"
|
||||
|
||||
RDEPEND="
|
||||
auto-completion? ( dev-libs/libtecla )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/flex
|
||||
sys-devel/bison
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-fix-automagic-libtecla-dependency.patch )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_with auto-completion libtecla)
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
inherit eutils autotools
|
||||
|
||||
DESCRIPTION="Filebench - A Model Based File System Workload Generator"
|
||||
HOMEPAGE="http://sourceforge.net/projects/filebench/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="CDDL"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-libs/libaio
|
||||
sys-devel/flex
|
||||
sys-devel/bison"
|
||||
RDEPEND=""
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
#epatch "${FILESDIR}/linux-port.patch"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf
|
||||
emake -j1 || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Install failed"
|
||||
|
||||
dodoc README AUTHORS
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
From: Göktürk Yüksek <gokturk@binghamton.edu>
|
||||
Subject: [PATCH] Fix automagic dependency on libtecla
|
||||
|
||||
Replace the unconditional AC_CHECK_LIB logic with AC_ARG_WITH to
|
||||
eliminate the automagic dependency on libtecla.
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -164,8 +164,11 @@
|
||||
AC_CHECK_LIB([kstat], [kstat_open])
|
||||
# Use libtecla for autocompletion if it is available. If it
|
||||
# is, then conditionally compile auto_comp.c (see Makefile.am)
|
||||
-AC_CHECK_LIB([tecla], [cpl_add_completion])
|
||||
-AM_CONDITIONAL(AUTOCOMP_LIBTECLA, test "$ac_cv_lib_tecla_cpl_add_completion" = yes)
|
||||
+AC_ARG_WITH([libtecla], AS_HELP_STRING([--with-libtecla], [Build with libtecla for autocompletion support (default: test)]))
|
||||
+AS_IF([test "x$with_libtecla" != "xno"], [
|
||||
+ AC_CHECK_LIB([tecla], [cpl_add_completion])
|
||||
+])
|
||||
+AM_CONDITIONAL([AUTOCOMP_LIBTECLA], [test "x$ac_cv_lib_tecla_cpl_add_completion" = "xyes"])
|
||||
# Check that librt is installed and supports async IO. First line
|
||||
# allows to add librt to the linkers path, second one checks
|
||||
# if aio_wait() is in it, third one checks if aio_waitn() is there (usually
|
||||
@ -1,369 +0,0 @@
|
||||
Index: filebench-1.2.4/filebench/flowop_library.c
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/flowop_library.c
|
||||
+++ filebench-1.2.4/filebench/flowop_library.c
|
||||
@@ -789,6 +789,7 @@ flowoplib_aiowait(threadflow_t *threadfl
|
||||
for (ncompleted = 0, inprogress = 0,
|
||||
aio = flowop->fo_thread->tf_aiolist;
|
||||
ncompleted < todo, aio != NULL; aio = aio->al_next) {
|
||||
+ int result;
|
||||
|
||||
result = aio_error64(&aio->al_aiocb);
|
||||
|
||||
Index: filebench-1.2.4/filebench/fileset.c
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/fileset.c
|
||||
+++ filebench-1.2.4/filebench/fileset.c
|
||||
@@ -32,8 +32,9 @@
|
||||
#include <math.h>
|
||||
#include <libgen.h>
|
||||
#include <sys/mman.h>
|
||||
-#include "fileset.h"
|
||||
+
|
||||
#include "filebench.h"
|
||||
+#include "fileset.h"
|
||||
#include "gamma_dist.h"
|
||||
|
||||
/*
|
||||
@@ -631,9 +632,9 @@ fileset_create(fileset_t *fileset)
|
||||
/* we are re-using */
|
||||
reusing = 1;
|
||||
filebench_log(LOG_VERBOSE,
|
||||
- "Re-using %s %s on %s file system.",
|
||||
+ "Re-using %s %s.",
|
||||
fileset_entity_name(fileset),
|
||||
- fileset_name, sb.st_fstype);
|
||||
+ fileset_name);
|
||||
}
|
||||
}
|
||||
(void) mkdir(path, 0755);
|
||||
Index: filebench-1.2.4/filebench/filebench.h
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/filebench.h
|
||||
+++ filebench-1.2.4/filebench/filebench.h
|
||||
@@ -32,6 +32,15 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
+#include <errno.h>
|
||||
+
|
||||
+#ifndef HAVE_BOOLEAN_T
|
||||
+typedef enum { B_FALSE, B_TRUE } boolean_t;
|
||||
+#endif
|
||||
+
|
||||
+#ifndef HAVE_U_LONGLONG_T
|
||||
+typedef unsigned long long u_longlong_t;
|
||||
+#endif
|
||||
|
||||
#include "vars.h"
|
||||
#include "misc.h"
|
||||
Index: filebench-1.2.4/filebench/eventgen.c
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/eventgen.c
|
||||
+++ filebench-1.2.4/filebench/eventgen.c
|
||||
@@ -40,9 +40,10 @@
|
||||
*/
|
||||
|
||||
#include <sys/time.h>
|
||||
+
|
||||
+#include "filebench.h"
|
||||
#include "vars.h"
|
||||
#include "eventgen.h"
|
||||
-#include "filebench.h"
|
||||
#include "flowop.h"
|
||||
#include "ipc.h"
|
||||
|
||||
Index: filebench-1.2.4/filebench/procflow.c
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/procflow.c
|
||||
+++ filebench-1.2.4/filebench/procflow.c
|
||||
@@ -30,8 +30,8 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
-#include "procflow.h"
|
||||
#include "filebench.h"
|
||||
+#include "procflow.h"
|
||||
#include "flowop.h"
|
||||
#include "ipc.h"
|
||||
|
||||
@@ -162,7 +162,7 @@ procflow_createproc(procflow_t *procflow
|
||||
}
|
||||
|
||||
#else
|
||||
- if (execl(execname, procname, "-a", procname, "-i",
|
||||
+ if (execlp(execname, procname, "-a", procname, "-i",
|
||||
instance, "-s", shmaddr, "-m", shmpath, NULL) < 0) {
|
||||
filebench_log(LOG_ERROR,
|
||||
"procflow exec proc failed: %s",
|
||||
Index: filebench-1.2.4/filebench/threadflow.c
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/threadflow.c
|
||||
+++ filebench-1.2.4/filebench/threadflow.c
|
||||
@@ -31,8 +31,9 @@
|
||||
#include <sys/lwp.h>
|
||||
#endif
|
||||
#include <signal.h>
|
||||
-#include "threadflow.h"
|
||||
+
|
||||
#include "filebench.h"
|
||||
+#include "threadflow.h"
|
||||
#include "flowop.h"
|
||||
#include "ipc.h"
|
||||
|
||||
Index: filebench-1.2.4/filebench/utils.c
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/utils.c
|
||||
+++ filebench-1.2.4/filebench/utils.c
|
||||
@@ -34,6 +34,8 @@
|
||||
#ifdef HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
+
|
||||
+#include "filebench.h"
|
||||
#include "utils.h"
|
||||
#include "parsertypes.h"
|
||||
|
||||
Index: filebench-1.2.4/filebench/vars.c
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/vars.c
|
||||
+++ filebench-1.2.4/filebench/vars.c
|
||||
@@ -30,12 +30,12 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
+#include "filebench.h"
|
||||
#include "vars.h"
|
||||
#include "misc.h"
|
||||
#include "utils.h"
|
||||
#include "stats.h"
|
||||
#include "eventgen.h"
|
||||
-#include "filebench.h"
|
||||
#include "fb_random.h"
|
||||
|
||||
static var_t *var_find_dynamic(char *name);
|
||||
Index: filebench-1.2.4/filebench/parser_gram.y
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/parser_gram.y
|
||||
+++ filebench-1.2.4/filebench/parser_gram.y
|
||||
@@ -46,8 +46,9 @@
|
||||
#ifdef HAVE_LIBTECLA
|
||||
#include <libtecla.h>
|
||||
#endif
|
||||
-#include "parsertypes.h"
|
||||
+
|
||||
#include "filebench.h"
|
||||
+#include "parsertypes.h"
|
||||
#include "utils.h"
|
||||
#include "stats.h"
|
||||
#include "vars.h"
|
||||
@@ -2642,7 +2643,7 @@ parser_help(cmd_t *cmd)
|
||||
} else {
|
||||
filebench_log(LOG_INFO,
|
||||
"load <personality> (ls "
|
||||
- "/usr/benchmarks/filebench/workloads for list)");
|
||||
+ FILEBENCHDIR "/workloads for list)");
|
||||
}
|
||||
}
|
||||
|
||||
Index: filebench-1.2.4/filebench/parser_lex.l
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/parser_lex.l
|
||||
+++ filebench-1.2.4/filebench/parser_lex.l
|
||||
@@ -38,9 +38,10 @@
|
||||
#ifdef HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
+
|
||||
+#include "filebench.h"
|
||||
#include "parsertypes.h"
|
||||
#include "utils.h"
|
||||
-#include "filebench.h"
|
||||
|
||||
#include "parser_gram.h"
|
||||
|
||||
Index: filebench-1.2.4/filebench/Makefile.am
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/filebench/Makefile.am
|
||||
+++ filebench-1.2.4/filebench/Makefile.am
|
||||
@@ -7,19 +7,19 @@
|
||||
#
|
||||
|
||||
bin_PROGRAMS = go_filebench
|
||||
-filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \
|
||||
+go_filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \
|
||||
utils.c flowop.c flowop_library.c ipc.c \
|
||||
vars.c stats.c eventgen.c fileset.c fb_random.c \
|
||||
parser_gram.y parser_lex.l
|
||||
-filebenchdir = $(datadir)/filebench
|
||||
-INCLUDES = -I../intl -DFILEBENCHDIR=\"$(prefix)/filebench\"
|
||||
+INCLUDES = -I../intl -DFILEBENCHDIR=\"$(FILEBENCHDIR)\"
|
||||
|
||||
MV=@MV@
|
||||
LEX=@LEX@
|
||||
YACC=@YACC@
|
||||
-LFLAGS = @LFLAGS@
|
||||
-YFLAGS = @YFLAGS@
|
||||
+AM_LFLAGS = @LFLAGS@
|
||||
+AM_YFLAGS = @YFLAGS@
|
||||
DEFS = -D_REENTRANT @DEFINES@
|
||||
+LIBS = @LDLIBS@
|
||||
BUILD = @BUILD@
|
||||
|
||||
parser_lex.c: parser_lex.l parser_gram.h Makefile
|
||||
Index: filebench-1.2.4/configure.in
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/configure.in
|
||||
+++ filebench-1.2.4/configure.in
|
||||
@@ -73,8 +73,8 @@ case "$host_os$host_cpu" in
|
||||
YFLAGS="-d"
|
||||
AC_DEFINE(HAVE_OFF64_T, 1,
|
||||
[ Define if we can use 64 bit files ])
|
||||
- FILEBENCHDIR=${prefix}/filebench
|
||||
- FILEBENCHBIN=${prefix}/bin
|
||||
+ FILEBENCHDIR=${datadir}/filebench
|
||||
+ FILEBENCHBIN=${bindir}
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -324,6 +324,6 @@ AC_SUBST(SRCDIR)
|
||||
AC_SUBST(FILEBENCHDIR)
|
||||
AC_SUBST(FILEBENCHBIN)
|
||||
|
||||
-AC_CONFIG_FILES([Makefile filebench/Makefile fastsu/Makefile workloads/Makefile workloads/build/Makefile scripts/Makefile benchpoint/Makefile benchpoint/bin/Makefile benchpoint/config/Makefile benchpoint/functions/Makefile benchpoint/profiles/Makefile])
|
||||
+AC_CONFIG_FILES([Makefile filebench/Makefile fastsu/Makefile workloads/Makefile workloads/build/Makefile scripts/Makefile benchpoint/Makefile benchpoint/bin/Makefile benchpoint/config/Makefile benchpoint/functions/Makefile benchpoint/profiles/Makefile bin/Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
Index: filebench-1.2.4/fastsu/fastsu.c
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/fastsu/fastsu.c
|
||||
+++ filebench-1.2.4/fastsu/fastsu.c
|
||||
@@ -1,23 +1,26 @@
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <strings.h>
|
||||
+#include <string.h>
|
||||
|
||||
-void
|
||||
+int
|
||||
main(int argc, char *argv[], char *envp[])
|
||||
{
|
||||
char *shell;
|
||||
char cmd[2048];
|
||||
|
||||
- *cmd = NULL;
|
||||
+ *cmd = '\0';
|
||||
shell=getenv("SHELL");
|
||||
- *(argv++);
|
||||
+ argv++;
|
||||
argc--;
|
||||
while(argc-- != 0) {
|
||||
(void) strcat(cmd,*argv);
|
||||
(void) strcat(cmd," ");
|
||||
- *(argv++);
|
||||
+ argv++;
|
||||
}
|
||||
|
||||
execlp(shell, shell, "-c", cmd, (char *) 0);
|
||||
+
|
||||
+ /* control should not reach here */
|
||||
+ return -1;
|
||||
}
|
||||
Index: filebench-1.2.4/benchpoint/config/Makefile.am
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/benchpoint/config/Makefile.am
|
||||
+++ filebench-1.2.4/benchpoint/config/Makefile.am
|
||||
@@ -6,8 +6,7 @@
|
||||
# See the file LICENSING in this distribution for details.
|
||||
#
|
||||
|
||||
-filebenchdir = $(prefix)/filebench
|
||||
-configdir = $(filebenchdir)/config
|
||||
+configdir = ${FILEBENCHDIR}/config
|
||||
|
||||
config_DATA = *.conf
|
||||
|
||||
Index: filebench-1.2.4/benchpoint/profiles/Makefile.am
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/benchpoint/profiles/Makefile.am
|
||||
+++ filebench-1.2.4/benchpoint/profiles/Makefile.am
|
||||
@@ -6,8 +6,7 @@
|
||||
# See the file LICENSING in this distribution for details.
|
||||
#
|
||||
|
||||
-filebenchdir = $(prefix)/filebench
|
||||
-configdir = $(filebenchdir)/config
|
||||
+configdir = ${FILEBENCHDIR}/config
|
||||
|
||||
config_DATA = *.prof
|
||||
|
||||
Index: filebench-1.2.4/bin/Makefile.am
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/bin/Makefile.am
|
||||
+++ filebench-1.2.4/bin/Makefile.am
|
||||
@@ -6,8 +6,5 @@
|
||||
# See the file LICENSING in this distribution for details.
|
||||
#
|
||||
|
||||
-filebenchdir = $(prefix)/filebench
|
||||
-scriptsdir = $(filebenchdir)/bin
|
||||
-
|
||||
-scripts_SCRIPTS = filebench
|
||||
+bin_SCRIPTS = filebench
|
||||
|
||||
Index: filebench-1.2.4/benchpoint/functions/Makefile.am
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/benchpoint/functions/Makefile.am
|
||||
+++ filebench-1.2.4/benchpoint/functions/Makefile.am
|
||||
@@ -6,8 +6,7 @@
|
||||
# See the file LICENSING in this distribution for details.
|
||||
#
|
||||
|
||||
-filebenchdir = $(prefix)/filebench
|
||||
-configdir = $(filebenchdir)/config
|
||||
+configdir = ${FILEBENCHDIR}/config
|
||||
|
||||
config_SCRIPTS = *.func
|
||||
|
||||
Index: filebench-1.2.4/scripts/Makefile.am
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/scripts/Makefile.am
|
||||
+++ filebench-1.2.4/scripts/Makefile.am
|
||||
@@ -6,8 +6,7 @@
|
||||
# See the file LICENSING in this distribution for details.
|
||||
#
|
||||
|
||||
-filebenchdir = $(prefix)/filebench
|
||||
-scriptsdir = $(filebenchdir)/scripts
|
||||
+scriptsdir = ${FILEBENCHDIR}/scripts
|
||||
|
||||
scripts_SCRIPTS = filebench_compare filebench_summary filebench_plot fs_flush
|
||||
|
||||
Index: filebench-1.2.4/workloads/Makefile.am
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/workloads/Makefile.am
|
||||
+++ filebench-1.2.4/workloads/Makefile.am
|
||||
@@ -6,8 +6,6 @@
|
||||
# See the file LICENSING in this distribution for details.
|
||||
#
|
||||
|
||||
-filebenchdir = $(datadir)/filebench
|
||||
-
|
||||
SUBDIRS = build
|
||||
|
||||
pkg: filebench
|
||||
Index: filebench-1.2.4/workloads/build/Makefile.am
|
||||
===================================================================
|
||||
--- filebench-1.2.4.orig/workloads/build/Makefile.am
|
||||
+++ filebench-1.2.4/workloads/build/Makefile.am
|
||||
@@ -6,8 +6,7 @@
|
||||
# See the file LICENSING in this distribution for details.
|
||||
#
|
||||
|
||||
-filebenchdir = $(prefix)/filebench
|
||||
-workloadsdir = $(filebenchdir)/workloads
|
||||
+workloadsdir = ${FILEBENCHDIR}/workloads
|
||||
|
||||
workloads_DATA = BUILD \
|
||||
bringover.f \
|
||||
@ -1,6 +1,5 @@
|
||||
DIST disc-cover-1.5.6.tar.gz 52749 SHA256 037a181e3ee76f4b25d9a391c1d32481d6f0d5049b53d623c98bc0dbcd519d22 SHA512 ac00eeda8da63312afa16fdd4d12d160c651dc44aa44e769b92cad1dd9ddb10f123e8fc64e14853302455047ec86582fa9de423ccacd32912a078d2a21cb0d8c WHIRLPOOL 5ccb7b670a759ef57fc664bb15a97505bf07389063502fd0c6800b2b42d6cb9b3bd65d82a653b4d34c43dcb7e26446656b73698970c42b4128a98a1a745e0fa8
|
||||
EBUILD disc-cover-1.5.6-r1.ebuild 688 SHA256 22ca3a3d52a9458d416aa4c8d14411d8947a805d635e837f0da83af84767dba5 SHA512 7754149dae783956260dbcd4f7fb8ed6355728c4e8b0ba37c70446ea04f4861e142fe2ae41d3a26cb22f0f3577f6cd50227c44fb6ec27bcf1687568d87722299 WHIRLPOOL c9b69fead1ea20522b1b8f4c07876926374fa6d6aa25c70dbffd7ab1595ce98a6fd37ca946eed49e66ddba5c79ce8ad1208f772df9dc11e8972f6f22c21fac87
|
||||
EBUILD disc-cover-1.5.6.ebuild 695 SHA256 ff8774ab77100def26bf481d3e8c5b337325345d46dc21d302d2ba1fc4f533b8 SHA512 b5bc1c191ec9dcc0803c1716d439581ddac33b73caf7ff220cb82ae0ca17bfae47a5d51facc7830d5b787f8991819144edaa4e3d352d7f40fadd73f49024808e WHIRLPOOL 191d35571c005ad895e329f680eeb6f9b27e397503d90f7fa05ce217a8a34d14f11391f3e7d9b59c65906a7c330377341ef25aaf00000f2ae3d14fc0846395f7
|
||||
MISC ChangeLog 3752 SHA256 80d86edc6ec56a7e927905f08cf07f046baa78ad2b92eec398ef745c133ec324 SHA512 2da5cb52182adfb8b381434ca3688765078e7dce853685c85ba4767cff5910339e99a854f84dc5ab8d2f05a928d8619a3f80e6868addf7535d0a33876d15703b WHIRLPOOL f8e8169dda884f4d75d646eee11b9939f3d80770fad24ae05e4e7714a8c05944bbbbe7cd22909292d418b1bac4855ee900c224f13cf05209a6024db80b11be41
|
||||
EBUILD disc-cover-1.5.6-r1.ebuild 687 SHA256 54e4ca49ea3fe115294e20205368d21a5e17aa006efbdaf852109f7d062d5ada SHA512 13757e8031ed0e133ad591f32823ab84de99c52fab0bdbbb7aa8b083fd29c4f4637ba28178e121d3cfade05ecf64ee26907838b673804db0b37e5448ecbd400c WHIRLPOOL a06fcc94506a0d21b1d80bc548e3853635e4cb079615295d173eff11f332f2723ea71efbc48d254b9a2e36a06f4243fbce7f415e3eff891bba8481dcf5e85c5d
|
||||
MISC ChangeLog 4138 SHA256 678ec934f18a3f1f0795503393a42283523fec506f4eb94b957fd328b52291b1 SHA512 22ccaab04555241b8f0175ed971a70c642b5e0a8be2a147532bb6b19db5db786259ab01e5ac00a3ac8d8e2e0721c5ee111f3a284509d9cd0d0751ea7738b3997 WHIRLPOOL 72268be089a37dc264c3a14c292ee801a5c90945e5522d1f708d962ea69d45a686e090f6d0297f77f2148eaaf654b8ff290ee1d28496fc70caac944c88cbed76
|
||||
MISC ChangeLog-2015 4215 SHA256 a132ca296ed8b1dd41984cb6e4b5423bca8308c7c637ef129d43d4a9286e0077 SHA512 82cc9ebd983bec680548eb5ec9cc7854ae679dc18e8766b24e80eed8f6132ed7b34f0a2c73b1725de29f1b2b0fbac126ad1bc54ba274913ba3da7df7a7724729 WHIRLPOOL ebaa0d12738a9d1e460e761c964f1a6b2c2dc56ac5559f7fef196767c298b3094e5e1bc6d7255cf020a82bc22437e7e8e665262922595b0dfe11d459e5a14b16
|
||||
MISC metadata.xml 594 SHA256 624085a800e745f59aaabf3900d12071c58df49ed27af7a52f60b69aff2e68ec SHA512 8a634700db69a104a04d11879d8be393d20e5139f148263d431caf4996992eb6d17053eec1100480ce50a08fe3a46d07925d67c443dea2a97e60f8cbfe5c06ec WHIRLPOOL 0a98c90df6ac3b8bbbaef1933672739c7775587c70ebbae2ab9ccda451e4944f23347921ef2ea434fa5caf24ad63219911a1249f71d02e261b10c4d35150ae6c
|
||||
MISC metadata.xml 466 SHA256 756103c42a71dc2081f212765ba079a96f532a476d74486a27ef12fa0d004da4 SHA512 c044f60cecf2c53192be2652fc8d2551708ebb42504dc156985ecea6fc4b0cc3330a5b7a5bab5384e18d266f948db07c2808174ed1bfce20d9eafacd3c5fcb88 WHIRLPOOL d6da994906c44753453f66e9de6da279a4ed8fdcbf29781b047c9effb8fd249194247690ca1818e7ec92e8b4e2ff0a06504dc75d1ed6683c974972e54732a044
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file"
|
||||
HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html"
|
||||
SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="amd64 ppc sparc x86"
|
||||
IUSE="cdrom"
|
||||
|
||||
SLOT="0"
|
||||
|
||||
DEPEND="dev-lang/perl"
|
||||
RDEPEND="${DEPEND}
|
||||
virtual/latex-base
|
||||
cdrom? ( dev-perl/Audio-CD-disc-cover )"
|
||||
|
||||
src_compile() {
|
||||
pod2man disc-cover > disc-cover.1 || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin disc-cover
|
||||
dodoc AUTHORS CHANGELOG TODO
|
||||
doman disc-cover.1
|
||||
insinto /usr/share/${PN}/templates
|
||||
doins templates/*
|
||||
}
|
||||
@ -1,16 +1,10 @@
|
||||
AUX eid-mw-4.0.2_p1188+gcc-4.7.patch 1027 SHA256 20e91da7a852448ce087ef84126140e6330c8b66a4730c3172a159086cc6acac SHA512 4beedc68e767060912cbf37b500bef18fac2c6af7c7577857901fdcd7f33740441a2a394c7f31fc3b217c53fd77f903f88b2cf79195c5dd69eb1c886c2c9ac6d WHIRLPOOL 7af848f2f25a2200f796ea8e42f2a48604461c913ce864a28e4d3557cdd28dbe7c4940233d2544fde3fc7cb9e56651c05ca2809d3fc8557539c7c3f2bf5f30ed
|
||||
AUX fix-nodialog-bug.patch 466 SHA256 8cec2674bf60decb0e6e34954993959cf1a098542664e738756d96c4d961ca4f SHA512 de752d889fd060507fcdf5fa8df43c769ca446603087192f2efd21db9c6eef3602620b76fb765340f29c76fe92b1ff746db68d31cf9a25a6121c0895f0597ed6 WHIRLPOOL bac33d9a333c3a9075d1d235f9540972e8d390503744edd0de680bf39a8bda7f72f6c70344b2777f208cba5696e2bdc1929fcac0e73a1e7557617051085233f3
|
||||
AUX gtk_not_required_4.1.4.patch 3148 SHA256 21d4353103c38641085b77ab72d5772a4b9a3185e4c8a48ab3b8963449abef17 SHA512 bf773066ad6d0fc56a0f36060f7413aea3e70b6acbb9eb44eb727d1760d11f57341eff994ce99c985e9e8ea26ec1ded344153b50b4f6b8673977b4077a680f24 WHIRLPOOL cb09fc1e64c62e342cfb360a7b02a4ff676c434ebab68e4cb98f7715e5ac34b49a9021bd4cdbd1c6bc81758714cd51f934ff8cdca902c08ddf8f7335902a0e74
|
||||
AUX gtk_not_required_9999.patch 3041 SHA256 2d5d0342dc517dc01e258aafc5f7b06007b54329b055c1a9e75faa30529ec7d0 SHA512 930ff14174fdec2396e836f7adaad24aa14f21d342551265dfeaea55ffe39d47171e9e18eb938f70c063115893b66e60120f15cb8bb5dc797f40d0fe1d3ee720 WHIRLPOOL db76c5ef13395d4ee9b130487d4db97978e11aec839ac8341663fdd4114a37c2a09f4de1ad463a09438c565da02b85ab168105e4380fa9772ff68adf69b82928
|
||||
DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
|
||||
DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
|
||||
DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
|
||||
DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
|
||||
EBUILD eid-mw-4.0.6_p1480.ebuild 1692 SHA256 0fde01fc15c958d41b110f0792856a36f6aa77ab30ae18f5b2495beb4aa7bcbc SHA512 b7d335eccf55340f170f5aeb6a8a9223892ba29642d40b3421b8a376badc25820e0fd26f1fa9df3a6446bdc0497202a8fcdc607dff186781bccf793719b78ea8 WHIRLPOOL b4d2c0957c9b150386c234cc6d69783ddd9c97c75035899dd9b8cbc9a8f0e2844193c915306aa452830024aaa129a75c5b9c7830904c7d5d9711642f38793b3e
|
||||
EBUILD eid-mw-4.0.6_p1620.ebuild 1647 SHA256 0f4b589cba0e0ed12009d4aec39a09349a07bea372ec52915621214c8129f42a SHA512 f4e9813fddb3c31988159757a1a07fa41b67d38a32a8d37aa17ac57ccf0ae6c9827c231d0272b653382ec4c661569d66c88ea0b26030b46d5124657267c42906 WHIRLPOOL b0b658305ab1df767b246782b0cfd7cf7cb65c9eca7461eba1693f455a2fe917e190c37414ce8073dbfd46f58269a47c8d8719f7497ba52b9bd9e23006823ee7
|
||||
EBUILD eid-mw-4.1.4.ebuild 2098 SHA256 f07d36317804cabfb39c9129bcfba3a3b01ee6663f39e539b14afbc43b60f661 SHA512 7c1a190f8caf4de1c1ec4a4c52900196b390258883d5e10b798292511e20f3215c9e80469c9e643a2fe41bf3f4a933a40bdd05e1bd6c1bd53bcec4c061f05871 WHIRLPOOL b261329cfc4a867e390f274eb5759c41c147c93deea590f51d6460b8178c8b448d79e66f8bf5a533b35fa20ed0a54f63daaab6eb17df0c1072ae4b3a3a1f941e
|
||||
EBUILD eid-mw-4.1.9.ebuild 2074 SHA256 51106dc6e30bc06b56663e710b4bd1b1dd9dc1360e87677be0f71bb4d6a32cee SHA512 f340b357f1a64b2c061ee18f436166db61357109a14296584e6d2f7ace19f49bfe03da0eaa1b5e1670f799c197ff8e866658a8b21fee21ff38b88aa4388cb159 WHIRLPOOL f600b71d8080ae655c299014b6495d235f9df5173990b3863a93c30253024a126241711c08b5af49d2a4d3488ee019364b44a54d01e82169abcf15ad655abdfb
|
||||
EBUILD eid-mw-9999.ebuild 2073 SHA256 6bf3ec1cce21de9ede22de591cee6052fd7e3ba87cfce8c45a488058365eb5ae SHA512 b39578637798ff177bc117ccf2cbb6929d4ec0cee9c9258eae5874d6e8fed6c32ced728cd4243b8e275b80628c0340edcec915f2f526cd8b14dfd72ff58c43e6 WHIRLPOOL eb684ecd2b456e48214703bff1c9782f6c2d3e344df2de357e7e29978be65499c1b0dd10ab95ec09e8f71081c943c34cec7f0a2ea28658d2e24197beaf47f7d9
|
||||
MISC ChangeLog 4745 SHA256 9dcfe295d8f1c6354b0bec1cf9cc6833c4f1f79e92aa375d8980086fc061861c SHA512 abd452d1f09f1126fe687ee21c03d95ba29f93a99d9aac59ef0d83299c008598f70a54dfad4e6537d799b1071ed2fdf39f79472663bc90d8916e1058255f68b1 WHIRLPOOL be272a6aeb8ef9b61fc860ad2ab83376b59789eb9ff8d8e0e0269ed8afd288681f7d551be1d4992ba633753ff742b5c4d3fd41e59505861853093964bc21f727
|
||||
MISC ChangeLog 5073 SHA256 2e4e5d0ed8db7f193daa1ca410d9a6d5223ad4346d6125e46904251e47f3dc83 SHA512 d3c7790d7f330cc7c43978fc2f2087fdd63cba845a9f91e93f8b1f71389b4cac6428ceaa4e9b856f348f28a4cde9d00bf1b3f72185653ca08a5b27411747c152 WHIRLPOOL 4aa6073a0320aaaf8a9e09be762f81e8178b22afb11941e484c728cb5efdb055d5bb83721b47302efcd8add7bf6c08c61cb721e5f6aafa950a587f1e26b25fb7
|
||||
MISC ChangeLog-2015 2329 SHA256 088b0d80f50d8e70360e034b4041bb2d6d5bf7a26e2cd20342b4fb1b8f99d571 SHA512 eca6e772f8cea012cf3f4cef551dac4142fec2379d5259f693b3c3c38c21c62be4f3953c0166e7c9be9822580dee836a93c827244387d1d4f75de70b16018e8a WHIRLPOOL c9fd64b8f14cc2cc2a992e1193871f8e0927f74e6a7366bf0c0d75782f7adafc3eb425d86ca75771ee2fbdf7ceb30c638b8aa86d736aaa487636e49927831970
|
||||
MISC metadata.xml 1491 SHA256 8582cf67745ec0c2c83c6173cfcea9be17904dce11a9a75cd4276d3d8d1437bf SHA512 dacf34307f55375c808a218dcebde3e8d59a60fe9e847bd57b33d285dcd352c9eb247f9a8e3f6b6d7be6684dfa6d675ff5fd61d0f249fe26a1ba048a904ffdc2 WHIRLPOOL 9cb559c3ce650f94a66398fbcb47d23f1a05d1b2076be35b3e2f381f52b7da05eecabfce4b8ba894ca485d4ded0303a0a8e0f4ee08b9ee36717a2469ac2177a8
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils versionator mozextension multilib
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
ESVN_REPO_URI="https://eid-mw.googlecode.com/svn/trunk/"
|
||||
inherit subversion autotools
|
||||
SRC_URI=""
|
||||
else
|
||||
MY_P="${PN}-${PV/_p/-}"
|
||||
SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-250016.gz -> ${MY_P}.tar.gz"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
|
||||
fi
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="LGPL-3"
|
||||
DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
|
||||
|
||||
HOMEPAGE="http://eid.belgium.be"
|
||||
|
||||
IUSE="+gtk +xpi"
|
||||
|
||||
RDEPEND="gtk? ( x11-libs/gtk+:2 )
|
||||
>=sys-apps/pcsc-lite-1.2.9
|
||||
xpi? ( || ( >=www-client/firefox-bin-3.6.24
|
||||
>=www-client/firefox-3.6.20 ) )
|
||||
!app-misc/beid-runtime"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
if [[ ${PV} == "9999" ]]; then
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
else
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/fix-nodialog-bug.patch
|
||||
}
|
||||
fi
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable gtk dialogs) --disable-static
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
if use xpi; then
|
||||
declare MOZILLA_FIVE_HOME
|
||||
if has_version '>=www-client/firefox-3.6.20'; then
|
||||
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
|
||||
xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
|
||||
fi
|
||||
if has_version '>=www-client/firefox-bin-3.6.24'; then
|
||||
MOZILLA_FIVE_HOME="/opt/firefox"
|
||||
xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
|
||||
fi
|
||||
fi
|
||||
rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils versionator mozextension multilib
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
|
||||
https://github.com/Fedict/${PN}.git"
|
||||
inherit git-2 autotools
|
||||
SRC_URI=""
|
||||
else
|
||||
MY_P="${PN}-${PV/_p/-}"
|
||||
SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
|
||||
fi
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="LGPL-3"
|
||||
DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
|
||||
|
||||
HOMEPAGE="http://eid.belgium.be"
|
||||
|
||||
IUSE="+gtk +xpi"
|
||||
|
||||
RDEPEND="gtk? ( x11-libs/gtk+:2 )
|
||||
>=sys-apps/pcsc-lite-1.2.9
|
||||
xpi? ( || ( >=www-client/firefox-bin-3.6.24
|
||||
>=www-client/firefox-3.6.20 ) )
|
||||
!app-misc/beid-runtime"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
if [[ ${PV} == "9999" ]]; then
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
fi
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable gtk dialogs) --disable-static
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
if use xpi; then
|
||||
declare MOZILLA_FIVE_HOME
|
||||
if has_version '>=www-client/firefox-3.6.20'; then
|
||||
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
|
||||
xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
|
||||
fi
|
||||
if has_version '>=www-client/firefox-bin-3.6.24'; then
|
||||
MOZILLA_FIVE_HOME="/opt/firefox"
|
||||
xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
|
||||
fi
|
||||
fi
|
||||
rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
Index: eid-mw-4.0.2/common/src/socket/socket.cpp
|
||||
===================================================================
|
||||
--- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
|
||||
+++ eid-mw-4.0.2/common/src/socket/socket.cpp
|
||||
@@ -21,6 +21,8 @@
|
||||
#include "../eiderrors.h"
|
||||
#include <iostream>
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
namespace eIDMW
|
||||
{
|
||||
|
||||
Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
|
||||
===================================================================
|
||||
--- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
|
||||
+++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <netinet/in.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <errno.h>
|
||||
+#include <unistd.h>
|
||||
#ifndef SOCKET_ERROR
|
||||
#define SOCKET_ERROR -1
|
||||
#endif
|
||||
Index: eid-mw-4.0.2/common/src/util.cpp
|
||||
===================================================================
|
||||
--- eid-mw-4.0.2.orig/common/src/util.cpp
|
||||
+++ eid-mw-4.0.2/common/src/util.cpp
|
||||
@@ -27,6 +27,8 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
+#include <unistd.h>
|
||||
+
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
@ -1,20 +0,0 @@
|
||||
Index: cardlayer/src/pinpadlib.h
|
||||
===================================================================
|
||||
--- cardlayer/src/pinpadlib.h (revision 1501)
|
||||
+++ cardlayer/src/pinpadlib.h (revision 1502)
|
||||
@@ -43,13 +43,14 @@
|
||||
#endif
|
||||
#ifndef NO_DIALOGS
|
||||
#include "../dialogs/src/dialogs.h"
|
||||
+#endif
|
||||
#ifdef __APPLE__
|
||||
typedef void* BEID_DIALOGHANDLE;
|
||||
#else
|
||||
typedef unsigned long BEID_DIALOGHANDLE;
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
+
|
||||
namespace eIDMW
|
||||
{
|
||||
#ifdef EIDMW_PF_EXPORT
|
||||
@ -1,8 +1,10 @@
|
||||
DIST libu2f-host-1.0.0.tar.xz 454376 SHA256 18c56b9b5cfea2566925bba45b25a4e20b3ef8696905d8f2a06116316e164374 SHA512 ef953ffd8179e5ed4bcd1e02ccc82e671a7979b03a61ac73098be6509ab9d6badd6bb4e3e805de4ddbddbae3e8be71b091344f4230657464f6ba4ac3af171387 WHIRLPOOL cc76b778bcf20ef696900dd0ea65c0925052360a22e505a34ecb8738289d7bbaa88b31f2b25b91b6a1a22a240d01784bc6ef1cb9774c818fa0570328e9f13183
|
||||
DIST libu2f-host-1.1.0.tar.xz 455424 SHA256 441bb832ee42acf3a5e5a229444c610218da381eb7daaf2aa750c004dc756d86 SHA512 3861ea748ff6ae0bae756182c6c4bd9a25dafc6e28eec3d6aad0eb700dcddc56ba61ed0c6a60395b8a296764c83b3fadb6954f9001cfb880e93758aaeecf34df WHIRLPOOL b6a91afd99a70db8c78a2a72950f210bbcbea0322780b768611aa528ad0159647bdc7446e1dffd91f8d9b6bcbd8105b8b38c9eb5d9eb2db9ef7d193c97096f3e
|
||||
DIST libu2f-host-1.1.1.tar.xz 455652 SHA256 e14d06196aba1fcf80498929e6460370e58b96e8298c57e4660030c045000e3c SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693 WHIRLPOOL 46fc4e087e2679bf8c07922fbd31200d702c5c88838812618c763615f24f7c0ecdc71ed4bd436fde1a9526eea23820bd6f2448040ce711f7fd87ca5c96281efd
|
||||
EBUILD libu2f-host-1.0.0-r1.ebuild 1298 SHA256 0337060553cd17f1bdd69bbed5fbaaeb81fae04d3232245f28dc352866116fd8 SHA512 6a3602f0f1021d06655d2fa4905fd9ca4045c995c289da85463f664cad9ba390ed7bd4248fbb6bdd5bfa20ab356ac9e456558d695de69ba75acd2e998bad21ec WHIRLPOOL ec0f46429651abefbef004ef2bb148afbc84b835bebf65f31a74bd2e9bb17254be767caeb987ab58882f70c62a20f2f356fa7556844298df0cfb9db6650dd9ce
|
||||
EBUILD libu2f-host-1.0.0.ebuild 994 SHA256 970a06635009bf6ad88ad95fc8c783b5658fdf18235231ca1500e9868f9c0c95 SHA512 7a14939759afd4784a815b01087a165fefc19d5d3764de938edd453e13159ad734063402029347505cf4e09b198f780b5b3a47d6119ba6fd6c050fe6a03b7605 WHIRLPOOL 5ef967d9a331fe8c0f3dd915fdcfc81d9ff49b863827bef844e910e13c585a406bb5dc10cff42caae69175af4c4ef4596f0d0709ac8dc3f1c18965245861f6b7
|
||||
EBUILD libu2f-host-1.1.0.ebuild 1298 SHA256 a93df1d2b579ec8e09df8ab9a594f27e6e9792a19f3b6666a8ed8263feed452d SHA512 e88a9cf0b943c20a1446e7ecb4ffb5b28d71c5e471b17c4c5406d1737346ef7bf94bbafe271265eeffdb3303b44f58ca4ebf66c04698e14809539452995db6da WHIRLPOOL fb6d67584f8ce350573703a23228ea55bc0c72159d4913d9988c62e5f631b6141243afbc084dc899d7f459682ae83d32dc5db1ed0380559d083cce669f8df45b
|
||||
MISC ChangeLog 3518 SHA256 ae40b47d557d2429ec222982dfebccd552b479589130e9144efa048bf540b1bb SHA512 b55bba2e60129306677fceffcfa1da00342e5b96fd1c1466f13f7a7dcecfed626465686570f1e1abfaa8a791e37f4b1a5faa78c9a2c91ca7eed17d8f421834de WHIRLPOOL ad9c455120a1b4ec5d1d485a27f8f797b7e1206c2bf47e80fa5989b095ae3c013349b12dc68185a29ac56552778e821280f89f3362d578be276cf6a62178ac65
|
||||
EBUILD libu2f-host-1.1.1.ebuild 1298 SHA256 a93df1d2b579ec8e09df8ab9a594f27e6e9792a19f3b6666a8ed8263feed452d SHA512 e88a9cf0b943c20a1446e7ecb4ffb5b28d71c5e471b17c4c5406d1737346ef7bf94bbafe271265eeffdb3303b44f58ca4ebf66c04698e14809539452995db6da WHIRLPOOL fb6d67584f8ce350573703a23228ea55bc0c72159d4913d9988c62e5f631b6141243afbc084dc899d7f459682ae83d32dc5db1ed0380559d083cce669f8df45b
|
||||
MISC ChangeLog 3687 SHA256 ee80e9dbce2312d837dc47cf723f5b7bf1095fa837b40390b5b443268b482846 SHA512 4a7b05988e31d50afc39d44119cd429236da79a4c20bfefd026c2d78e82dd68cb887a5a164e5f991b50783e9a8cb8f50f26495ee7f213ec374bd8f48223c1e3c WHIRLPOOL a48357bc46350289adf802e59173047043d26f6946af078071bb4d429a9404d7144c9afed5d1724df8672c248a612c3d79114ee9950e77fd599cf21240d1d40d
|
||||
MISC ChangeLog-2015 2133 SHA256 3d7ffd9b6837711427ad55900ae8d1b86604a402bcbf68eef1cf0b2505b7a0bb SHA512 1b3d77426205539397fe682d3aa87610959b60753317051bc61d1f4453dee35423787f42eb826bc3109f21f11a45443886dfa3efe43db96d8a10bae70788e63f WHIRLPOOL e5efbd77cd337779edbff94d99c6a293eb7465e449d44d3d46f2b5dcaa35bb82116565b46eb6e7fe850f9ab5916a6ef7501a95a9bf1998835d4a1cefccf9bedc
|
||||
MISC metadata.xml 635 SHA256 d8fe201d56f78cc3a845ef6e39fb7a3fe71ee1626491aff1c13a809ce0950748 SHA512 da5145a27e76a717d9be746bf81ff4b12014f4daa7f547f646c503896f936b782c9d0a7dc2d185b01ca46f1bfab37dca1f950e127465af26950292ce07179820 WHIRLPOOL 00df72cc502fc56c55c490bd375d978c2ab4aafb65d1683c609e43284cb0230322240f107ee17c58c55ecc4401db610b02d398286c565004d697c997aa636df9
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit autotools-utils linux-info udev user
|
||||
|
||||
DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
|
||||
HOMEPAGE="https://developers.yubico.com/libu2f-host/"
|
||||
SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="kernel_linux static-libs systemd"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/hidapi
|
||||
dev-libs/json-c"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
RDEPEND="${RDEPEND}
|
||||
systemd? ( sys-apps/systemd[acl] )"
|
||||
|
||||
CONFIG_CHECK="~HIDRAW"
|
||||
|
||||
pkg_setup() {
|
||||
# The U2F device node will be owned by group 'plugdev'
|
||||
# in non-systemd configurations
|
||||
if ! use systemd; then
|
||||
enewgroup plugdev
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
autotools-utils_src_prepare
|
||||
|
||||
sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
|
||||
70-u2f.rules > 70-u2f-udev.rules || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
autotools-utils_src_install
|
||||
|
||||
if use kernel_linux; then
|
||||
if use systemd; then
|
||||
udev_dorules 70-u2f.rules
|
||||
else
|
||||
udev_newrules 70-u2f-udev.rules 70-u2f.rules
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use systemd; then
|
||||
elog "Users must be a member of the 'plugdev' group"
|
||||
elog "to be able to access U2F devices"
|
||||
fi
|
||||
}
|
||||
@ -1,21 +1,17 @@
|
||||
DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
|
||||
DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
|
||||
DIST emacs-18.59-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f
|
||||
DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
|
||||
DIST emacs-23.4-patches-17.tar.xz 16164 SHA256 bc9d4a36239f2749e218d903b67102e211a3a62ef162f5ab2801865dab77b752 SHA512 ceccd559b4f53328d75016b64d246ecf6fca7edebd080ce3bbba5f4d000bec38be5da91f3195c972ede0710da14b3be0545891321259b0a0b2963981c8fd62de WHIRLPOOL 4b70ce4d876e92a006e3dc0a31301f604aa8fa53a198515d1cbb3517a94933b1d7a11636494c1bd28ad1049a5a233d4ec13213e74e1eaff1cf96bb1fd095c345
|
||||
DIST emacs-23.4-patches-19.tar.xz 17684 SHA256 078f5e103af9b9950afefcb8575eefd7b07eb0a241ab67ddb3b8b6d31f657abb SHA512 118d58cd5c8a74b39642bf45920fed25687af2e4a076affe985bf359862950eeba4f2ca99c6482c17c311466fbfaab3f4d583466821da4917fae9bec6e95940a WHIRLPOOL f6fe96f5cb0c2de2a48e6eda2cd26c9c724cd2da661ef4d3e4e4dd14382299615aac4b95bd4e7a21caae74b7630a70d160d65e89f6ac5fa91ad8d9bedaddded4
|
||||
DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
|
||||
DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc
|
||||
DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
|
||||
DIST emacs-24.5-patches-1.tar.xz 3744 SHA256 dbcad232dff47e5540fff33351d76a92165e3d379a9c1fe52c04268a1ae245f8 SHA512 0c17546211493a521eec026e05722ebfa0988d2d97c916f8ddbe4d54220fbb6256cb8ad76769a8832fe7028051ecfe04d8ac46da71d7c5a6d2906b57466496db WHIRLPOOL 29cbd3513a62b025994918c6fbf86d70e282dfc0b1fc70639afcf356946e7c46ecc099a552e3735346d6b13c494db93246605eff002c34f1d0859ac04f1025fe
|
||||
DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3
|
||||
EBUILD emacs-18.59-r10.ebuild 4114 SHA256 83ae94e8051effaf69c632574f71bb89e7c3b9035ca34acadd7946e1e795eb6c SHA512 3b33ef097f37c8a85aa5ac3400aded4a32cb11e139971887f1d9c7bfe6519578f5d43560596ad6b31d64997e076df1631496b64b47bd5745f88c0a2491a334ab WHIRLPOOL 08175e8e97577f10bafe5946d31526bd8568cbea55ac9503a415bf9e33e097577fca4af0f354953257d73225af849034173c1db441e58567b5d80c2c8216e0bb
|
||||
EBUILD emacs-18.59-r11.ebuild 4151 SHA256 0a0e8eb5e069eb5899666d00a49bb665e302579686643f7a21041ac21af0d005 SHA512 b22437982669705b2ff512d79d01fc7b8122c5aa4dde744a281095144bf401b04e7ccfa6e5b0502d94706ddd995d38c5047e162811b759c0e4df2453041e25a8 WHIRLPOOL 353997c377a11d5714dd4c4a632cc5de419686953e193d5a555feb82feeb3a4ee8740e9bf8cc46b48ef45dd45eb066019fb5791f383115dae9c4976306173690
|
||||
EBUILD emacs-23.4-r13.ebuild 11203 SHA256 037784d9c161e9e2eded28ba17db1dfc3d0e3ffc1502f149c54eea7a494bf5ad SHA512 9209d04493a0dcafe595d5da6db39af391038bc23913519bd8b4b1ea2ee8a97acdb59ad4ba3d6b986c2066146da8f405de3cc68421587f57ea7e53f61718bc17 WHIRLPOOL 1764e8b39f9ab6abb4152828573447bbe1f020258a3e09c9b3f62a7dfde2c19edcfa1e9ac33129e532d0d4d285cdeec367c2a8cb7eaa324762f039f559dce95a
|
||||
EBUILD emacs-23.4-r14.ebuild 11230 SHA256 5afc9e683a83bff582cf0e2c27d7d63789e86b59bb3488a973e4b7034fe6c011 SHA512 dece8ae8de0bafc241d9cc760e5d3ac5abe98d11aeda2518cc243e25e56e1f122ba5987f4dc9b11d93519ce07bfdf1eef495da106d8a4beb42f5ecc6f6176923 WHIRLPOOL af3726bbbae34c035e4ce7d57d4af22ba7db1ced91a1225f47a1ffaab8f26aef35cd03c7e5a6a570b2fe82c7fdcac815fcabb868f52d69e89b242501497d1887
|
||||
EBUILD emacs-23.4-r14.ebuild 11228 SHA256 32ab86432e08eaa78c0c885f48d89e3f991e820887f8be2978875b960c6ff92b SHA512 79733bb6967f52ced679f6de8ebb491178181d4712993faa46976bd533bef7c68141d3d7083c5719c183dadf7556b32a2a3625896f9ef68fbc3d66c172e99256 WHIRLPOOL 230ebf0d82aee3b29435f81a78d778dec5aa1c5e91bce3f1daf23036457b9627c404f93ae3b0257c0282a86a34e5f052540f2a15cd27b67f21db176e3571fc4c
|
||||
EBUILD emacs-24.4-r4.ebuild 10566 SHA256 1ba2a884195df1186fbfb5f64b12b3aad96e6cf8d25926095a3e7e002ea0785d SHA512 ab96e6c97264a85c58fb0b718842ed0fc2f4972e2b59e830206d5f2aa482b203fbb39ba849d0bdf10905a718e74622deae486f60c4996a2a5050a678b2b08644 WHIRLPOOL dfaa59132ce315a1624d2fb2425420f8828c1eef125d57e656390b170e88d2960c031e0f47f4879e95a193b5f8261ec7ed38ec1d787fa8763e80bb61cb91b616
|
||||
EBUILD emacs-24.5-r1.ebuild 11061 SHA256 f2c956072124046ee974b2045a6f25121307772c56a2b761621302fd11c7e331 SHA512 a2272c43a6f541e4c2500bf3913bf11760500e13d53a458edaae106b0a0986342b26839d7cb887a143f17d4e43c62fa922710669319da42578c770f562de94d9 WHIRLPOOL dc12cc81a1bee4416da261dbf328479c143d1a3a58d40c9ce99ad60dd4487efa5f6e7c3b6fbc010d327a313a9e683bb4f0be674b7e61c04b496a82a21b0fb16c
|
||||
EBUILD emacs-24.5-r1.ebuild 11059 SHA256 2f8b243f18c2276ebf96d41ba45eeb7f57db84feede189e29e901c699c92d4dc SHA512 79294ef11bf7f158d6fcbae1c4f9475231d421e05463479ff38773a9d6ad217d9a125725b63688d2d84ef5b5fc6ecefca7556b46104a8bc6d50905bf46bf2db3 WHIRLPOOL 5fd850266bc9cf51dce229cb52e0242a45d4f51ec27406b08cde8f55f1c4aa0153114635a4d1b7cc09345a1af08f98cc9f8ee0990e2bdd7fba5cb45b56c8c637
|
||||
EBUILD emacs-24.5.ebuild 11044 SHA256 6d24668b822c66a0b31137fd64570327bd74a9fad2e8742ddffecf7a3d0fa14e SHA512 9c6b5e49f4741aacb4e2f1e586024159c3a5319716d93add0141e583e367fd668e7b9f5f1c918dbf8bc33fd4ff4c180431e5ee438b4ae8f7b283ce084569589c WHIRLPOOL 6600dab809b8600f872b02346fac8ab87fd59a4690d54f9aba055b960f24add61a126c144a7380fab5ae5dfd4373b95b303953ab39e47996440ea06319aa8648
|
||||
MISC ChangeLog 8600 SHA256 70eef931685294a8900000fa879e5d03c675a5046a7cc36c10e924c68a0bf2c0 SHA512 4e8ab7e17de91d7151610781fae096d833e131e8f16e2d7034044d1d50e436876bf4f53ad1a3799497c83093052a42861e3ce890ecf69e059d8ac58fa7cd163d WHIRLPOOL 47d9f7d9574845aa3175941247c8094efe75e57976dc30ec4a8ec03ab20bc11805aedd84a64c5fd4d11482f0ab43083df463e9556b7de41574877c875bb9933b
|
||||
MISC ChangeLog 9773 SHA256 fa11dc437fae07f8a330a9ad7f3576b9222ada8cd0a02b8d832b97beb907a1d4 SHA512 0f775e0fd9230ce261baa890a9132c4b5f5eaefd8796e51faa262927f269c913ccef929f5cca9da16d73c9a1ee360f671ef935029db79e039acb5369d21c2728 WHIRLPOOL 0450eb0febaa4dabdf2d64cb1d48ff9c75bd9cbc9e1a1fd4acfca895ac8b39ce69535b7f29638370211225dc580c6df5100a6414451423ed6c950678997e5708
|
||||
MISC ChangeLog-2015 93870 SHA256 0de5747f6d5fff7e3dfca0a37269e4c804d6ab3c9fdb34d39e51b650ce46117a SHA512 d41a91ed0454ab885df588edc8a7ee1b97faed64cd479dc12fadbb8056c36b81aabd43ea521171db511e7061ccbfbaec4c443924528dd1779147a4cf5537bf57 WHIRLPOOL c51fbaa8eae82fb02fc76683b2cdf0de65321b07fc1f5b9c2d929a605ac48ce7354f1d4fdc9a7bf1833e9e7280f4cd62e9130b94107b5860890d255ba1b14ea7
|
||||
MISC metadata.xml 2576 SHA256 2ea79bae728183789a3619b7d1e02422125237513dcc8ab2c7e3580011d4ff59 SHA512 e1af4c39ed9ff2ccad79bb0401809ed433fb30836270ddc76937bffcc3688b32e5d8dc29f23c0c01facdcaa069acf73fa0b75e33f26dc075cd79afb49f46c37c WHIRLPOOL 3dce181c54e30d66ed75abad7ced29949105a435f0b1f669c95f267466d97d6da92b3f3d200c4d711c7633dcadef1a5fb2e8d9a71288999db693fcb669c724dd
|
||||
|
||||
@ -1,151 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils toolchain-funcs flag-o-matic multilib
|
||||
|
||||
DESCRIPTION="The extensible self-documenting text editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
|
||||
ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-8.tar.bz2"
|
||||
|
||||
LICENSE="GPL-1+ GPL-2+ BSD" #HPND
|
||||
SLOT="18"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="abi_x86_x32"
|
||||
|
||||
RDEPEND=">=app-eselect/eselect-emacs-1.16
|
||||
sys-libs/ncurses:0
|
||||
amd64? (
|
||||
abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_x32(-)?] )
|
||||
!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)] )
|
||||
)"
|
||||
# X? ( x11-libs/libX11[-xcb] )
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
|
||||
EPATCH_SUFFIX=patch epatch
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# autoconf? What's autoconf? We are living in 1992. ;-)
|
||||
local arch
|
||||
case ${ARCH} in
|
||||
amd64)
|
||||
if use abi_x86_x32; then
|
||||
arch=x86-x32
|
||||
multilib_toolchain_setup x32
|
||||
else
|
||||
arch=intel386
|
||||
multilib_toolchain_setup x86
|
||||
fi
|
||||
;;
|
||||
x86) arch=intel386 ;;
|
||||
*) die "Architecture ${ARCH} not yet supported" ;;
|
||||
esac
|
||||
local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
|
||||
#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
|
||||
sed -e "${cmd}" src/config.h-dist >src/config.h || die
|
||||
|
||||
cat <<-END >src/paths.h
|
||||
#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
|
||||
#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
|
||||
#define PATH_LOCK "/var/lib/emacs/lock/"
|
||||
#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
|
||||
END
|
||||
|
||||
sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
|
||||
-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
|
||||
src/s-linux.h || die
|
||||
|
||||
# -O3 and -finline-functions cause segmentation faults at run time.
|
||||
filter-flags -finline-functions
|
||||
replace-flags -O[3-9] -O2
|
||||
strip-flags
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Do not use the sandbox, or the dumped Emacs will be twice as large
|
||||
export SANDBOX_ON=0
|
||||
emake --jobs=1 \
|
||||
CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
|
||||
LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local basedir="/usr/share/emacs/${PV}" i
|
||||
|
||||
dodir ${basedir}
|
||||
dodir /usr/share/man/man1
|
||||
emake --jobs=1 \
|
||||
LIBDIR="${D}"${basedir} \
|
||||
BINDIR="${D}"/usr/bin \
|
||||
MANDIR="${D}"/usr/share/man/man1 \
|
||||
install
|
||||
|
||||
rmdir "${D}"${basedir}/lock || die
|
||||
find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
|
||||
-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
|
||||
fperms -R go-w ${basedir}
|
||||
|
||||
# remove duplicate DOC file
|
||||
rm "${D}"${basedir}/etc/DOC || die
|
||||
|
||||
# move executables to the correct place
|
||||
mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
|
||||
for i in etags ctags emacsclient; do
|
||||
mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
|
||||
rm "${D}"${basedir}/etc/${i} || die
|
||||
done
|
||||
|
||||
dodir /usr/libexec/emacs/${PV}
|
||||
for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
|
||||
yow env server
|
||||
do
|
||||
mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
|
||||
dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
|
||||
done
|
||||
for i in test-distrib make-docfile; do
|
||||
rm "${D}"${basedir}/etc/${i} || die
|
||||
done
|
||||
|
||||
# move man page
|
||||
mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
|
||||
|
||||
# move Info files
|
||||
dodir /usr/share/info
|
||||
mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
|
||||
dosym ../../info/emacs-${SLOT} "${basedir}"/info
|
||||
docompress -x /usr/share/info
|
||||
|
||||
# move Info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
|
||||
touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
|
||||
|
||||
dodir /var/lib/emacs
|
||||
diropts -m0777
|
||||
keepdir /var/lib/emacs/lock
|
||||
|
||||
dodoc README PROBLEMS
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# move Info dir file to correct name
|
||||
if [[ -d "${D}"/usr/share/info ]]; then
|
||||
mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
@ -1,348 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
WANT_AUTOMAKE="none"
|
||||
|
||||
inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-17.tar.xz"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
|
||||
SLOT="23"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
|
||||
REQUIRED_USE="?? ( aqua X )"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:0
|
||||
>=app-eselect/eselect-emacs-1.16
|
||||
>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
|
||||
net-libs/liblockfile
|
||||
hesiod? ( net-dns/hesiod )
|
||||
kerberos? ( virtual/krb5 )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
gpm? ( sys-libs/gpm )
|
||||
dbus? ( sys-apps/dbus )
|
||||
X? (
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gif? ( media-libs/giflib )
|
||||
jpeg? ( virtual/jpeg:0= )
|
||||
png? ( >=media-libs/libpng-1.4:0= )
|
||||
svg? ( >=gnome-base/librsvg-2.0 )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? ( x11-libs/gtk+:2 )
|
||||
!gtk? (
|
||||
motif? ( >=x11-libs/motif-2.3:0 )
|
||||
!motif? (
|
||||
Xaw3d? ( x11-libs/libXaw3d )
|
||||
!Xaw3d? ( athena? ( x11-libs/libXaw ) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
alsa? ( virtual/pkgconfig )
|
||||
dbus? ( virtual/pkgconfig )
|
||||
X? ( virtual/pkgconfig )
|
||||
gzip-el? ( app-arch/gzip )
|
||||
pax_kernel? (
|
||||
sys-apps/attr
|
||||
sys-apps/paxctl
|
||||
)"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!<app-editors/emacs-vcs-${PV}"
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
# FULL_VERSION keeps the full version number, which is needed in
|
||||
# order to determine some path information correctly for copy/move
|
||||
# operations later on
|
||||
FULL_VERSION="${PV%%_*}"
|
||||
S="${WORKDIR}/emacs-${FULL_VERSION}"
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_SUFFIX=patch epatch
|
||||
epatch_user
|
||||
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
if ! use alsa; then
|
||||
# ALSA is detected even if not requested by its USE flag.
|
||||
# Suppress it by supplying pkg-config with a wrong library name.
|
||||
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
|
||||
|| die "unable to sed configure.in"
|
||||
fi
|
||||
if ! use gzip-el; then
|
||||
# Emacs' build system automatically detects the gzip binary and
|
||||
# compresses el files. We don't want that so confuse it with a
|
||||
# wrong binary name
|
||||
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
|
||||
|| die "unable to sed configure.in"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -fstrict-aliasing -pie
|
||||
append-flags $(test-flags -fno-strict-aliasing)
|
||||
|
||||
if use sh; then
|
||||
replace-flags "-O[1-9]" -O0 #262359
|
||||
elif use ia64; then
|
||||
replace-flags "-O[2-9]" -O1 #325373
|
||||
else
|
||||
replace-flags "-O[3-9]" -O2
|
||||
fi
|
||||
|
||||
local myconf
|
||||
|
||||
if use alsa && ! use sound; then
|
||||
einfo "Although sound USE flag is disabled you chose to have alsa,"
|
||||
einfo "so sound is switched on anyway."
|
||||
myconf+=" --with-sound"
|
||||
else
|
||||
myconf+=" $(use_with sound)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
# GTK+ is the default toolkit if USE=gtk is chosen with other
|
||||
# possibilities. Emacs upstream thinks this should be standard
|
||||
# policy on all distributions
|
||||
local f
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
myconf+=" --with-x-toolkit=gtk"
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
# Save version information in the Emacs binary. It will be available
|
||||
# in variable "system-configuration-options".
|
||||
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
|
||||
|
||||
# According to configure, this option is only used for GNU/Linux
|
||||
# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
|
||||
# out the location because $(get_libdir) does not necessarily return
|
||||
# something that matches the host OS's libdir naming (e.g. RHEL).
|
||||
local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
|
||||
crtdir=${crtdir%/*}
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-crt-dir="${crtdir}" \
|
||||
--with-gameuser=":gamestat" \
|
||||
$(use_with hesiod) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with gpm) \
|
||||
$(use_with dbus) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
|
||||
emake CC="$(tc-getCC)" \
|
||||
AR="$(tc-getAR) cq" \
|
||||
RANLIB="$(tc-getRANLIB)"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|
||||
|| die "removing duplicate emacs executable failed"
|
||||
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|
||||
|| die "moving emacs executable failed"
|
||||
|
||||
# move man pages to the correct place
|
||||
local m
|
||||
mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
|
||||
mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
|
||||
|| die "moving ${m} man page failed"
|
||||
done
|
||||
|
||||
# move info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|
||||
|| die "moving info dir failed"
|
||||
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
|
||||
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
|
||||
|
||||
# avoid collision between slots, see bug #169033 e.g.
|
||||
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
|
||||
rm -rf "${ED}"/usr/share/{applications,icons}
|
||||
rm -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/site-lisp dir
|
||||
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
|
||||
|
||||
# remove COPYING file (except for etc/COPYING used by describe-copying)
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
|
||||
|
||||
local cdir
|
||||
if use source; then
|
||||
cdir="/usr/share/emacs/${FULL_VERSION}/src"
|
||||
insinto "${cdir}"
|
||||
# This is not meant to install all the source -- just the
|
||||
# C source you might find via find-function
|
||||
doins src/*.{c,h,m}
|
||||
doins -r src/{m,s}
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
|
||||
elif has installsources ${FEATURES}; then
|
||||
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
|
||||
fi
|
||||
|
||||
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
|
||||
X
|
||||
;;; ${PN}-${SLOT} site-lisp configuration
|
||||
X
|
||||
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
|
||||
Y (setq find-function-C-source-directory
|
||||
Y "${EPREFIX}${cdir}")
|
||||
X (let ((path (getenv "INFOPATH"))
|
||||
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
|
||||
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
|
||||
X (and path
|
||||
X ;; move Emacs Info dir before anything else in /usr/share/info
|
||||
X (let* ((p (cons nil (split-string path ":" t))) (q p))
|
||||
X (while (and (cdr q) (not (string-match re (cadr q))))
|
||||
X (setq q (cdr q)))
|
||||
X (setcdr q (cons dir (delete dir (cdr q))))
|
||||
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
|
||||
EOF
|
||||
elisp-site-file-install "${T}/${SITEFILE}" || die
|
||||
|
||||
dodoc README BUGS
|
||||
|
||||
if use aqua; then
|
||||
dodir /Applications/Gentoo
|
||||
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
|
||||
mv nextstep/Emacs.app \
|
||||
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
|
||||
fi
|
||||
|
||||
DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
|
||||
through the Emacs eselect module, which also redirects man and info
|
||||
pages. Therefore, several Emacs versions can be installed at the
|
||||
same time. \"man emacs.eselect\" for details.
|
||||
\\n\\nIf you upgrade from a previous major version of Emacs, then
|
||||
it is strongly recommended that you use app-admin/emacs-updater
|
||||
to rebuild all byte-compiled elisp files of the installed Emacs
|
||||
packages."
|
||||
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
|
||||
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
|
||||
machine would satisfy basic Emacs requirements under X11.
|
||||
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
|
||||
for how to enable anti-aliased fonts."
|
||||
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
|
||||
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
|
||||
it into /Applications by yourself."
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# move Info dir file to correct name
|
||||
local infodir=/usr/share/info/${EMACS_SUFFIX} f
|
||||
if [[ -f ${ED}${infodir}/dir.orig ]]; then
|
||||
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
|
||||
elif [[ -d "${ED}"${infodir} ]]; then
|
||||
# this should not happen in EAPI 4
|
||||
ewarn "Regenerating Info directory index in ${infodir} ..."
|
||||
rm -f "${ED}"${infodir}/dir{,.*}
|
||||
for f in "${ED}"${infodir}/*; do
|
||||
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
|
||||
install-info --info-dir="${ED}"${infodir} "${f}" \
|
||||
|| die "install-info failed"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elisp-site-regen
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use livecd; then
|
||||
# force an update of the emacs symlink for the livecd/dvd,
|
||||
# because some microemacs packages set it with USE=livecd
|
||||
eselect emacs update
|
||||
elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
|
||||
# refresh symlinks in case any installed files have changed
|
||||
eselect emacs set ${EMACS_SUFFIX}
|
||||
else
|
||||
eselect emacs update ifunset
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
AUX expand-request-versions.patch 392 SHA256 adde0a499303529a89715a8562382f4fd9bc6a9615163dc4542d1d0876ebac1b SHA512 6ac22067fed310b69b81918c974debb66b051b54d79540bd6dc5e2ad0825d197a5fc911b4811657bd439cbe67ea2007350e9ead52ebb2386d333d9be735f5f95 WHIRLPOOL 43a6cf2a2626075903ab3685fa4ca57da4651906296c8ba2ac6ad4aeb33bd1cf31e1bd3b310d60f42b14fd6966e7393fc006505c86164ddd3b0ae9e351ad3a1c
|
||||
AUX requests-requirements.patch 392 SHA256 6d3e3acb78ab087ecb3c93cda0793d0e58fa464de0180a8c7124681788b80a93 SHA512 fc411e4d8acca68cb853aa509150229222ec408e2318813b28e8eb20a81ce35e664043ca7a48dbf825ec0c98813fb91fb1509ebab198e6a3dc559ac916ae7ee6 WHIRLPOOL bf51b01f0c1977c1e0c11f08c5f0ba6e0f1f4c9e16d42973b1d58abc6933000fbd2b39b42f98b3d640da2e6dbb5665efc97806229bab5b35c2839fefe6a632dd
|
||||
DIST docker-compose-1.4.0.tar.gz 79532 SHA256 2748cc8dd0829b44f0f686e36683cab58e1a4bc869442a04508504d2f62d0337 SHA512 470442aa78ddb24e8b9287953031e17a96a89780edd3a85955c923ffe00f4bfe655412dc15422437121593d7e2899f0847813d3716fc9ed576f93e6455cb868b WHIRLPOOL 9dc6731dad3df6422ec1e1b66049c8e9f04068b2fc2c8180da44220c1fbedc4919dfe17475cd539c3f33a079f3d04f875baaf769a7bc0875de48cf622670dc4b
|
||||
DIST docker-compose-1.5.1.tar.gz 104331 SHA256 df5e885fd758a2b5983574d6718b5a07f92c7166c5706dc6ff88687d27bfaf55 SHA512 be6678c27b73516e14bf80255e52bde72517bd65a91f1be2393a15f0f0b87ff9ddd785e22016a9a5e1a68d5e6b9be395a96d60b7bc862f24647adf81752b9baa WHIRLPOOL 0b1312cb0d99a7cf02d8a88a7b00f3105f497c1cfa0ac3b32b369cd3984f2b1eaa8ea2c9e2e5a70ada3a371fb8a774245b75eaf5a7665170398df5f703793311
|
||||
DIST docker-compose-1.5.2.tar.gz 106583 SHA256 79aa7e2e6ef9ab1936f8777476ffd4bb329875ec3d3664d239896d2f2a3c4f4f SHA512 be671503bbb91fdb5fdf9ff593f28d290d1c65738d055629d8252cf4c4eea7f5931a1e1d6d7a0b27640166671ecb095b413cb694b768437be3ec207e059f4ccc WHIRLPOOL bb12df93739329b9577db41a317a22976dc97ca1d1d3dd72e2ff4b8c245caf106f1aab466d42ffa7b9e6a7bf6f628f8977d2700460591051dade074535f0175e
|
||||
EBUILD docker-compose-1.4.0.ebuild 1666 SHA256 ffbf052af43ab06dc53a3abebf5c743159bc9dbd115e0cf8cfadfbcc49f4eae1 SHA512 c985c42f8c874f2b6e81b0d1fefda39fd5cb6da352640dcc710f454fe45cae3731d0e359c83fee484829d59a5a61a737dff90a01d92f25122af28390bda31ef4 WHIRLPOOL bf757edd25d1004459dc16846f76f445f0ad12feb3cb78aa76b41215fea1a2eaa22f0b8d31cb4c085be878a11b00bc83cd68b1aa3d96a4fe9a605e12f7fd99f1
|
||||
DIST docker-compose-1.6.2.tar.gz 128730 SHA256 264e2cbdd3fa314ba75f2681d10b0cff8d989a62979c1ba42d15a6d4c4002482 SHA512 7254a7e88b9030eeac87c1c6abfeea12e978519cc4e0236e37537c3143198d448e504107b1599b355a3c75e03e0acbd6fe552d0ff482cd3e91772d759a85544a WHIRLPOOL 3755ef9c189bd08f5bb810bf527041393ab788dcd302e6f1553989de73375ba34e062d2b21c10b144132ce9eb3997310b683b1b5b46aaf992fedfaa652deb6b2
|
||||
EBUILD docker-compose-1.5.1.ebuild 1886 SHA256 590623461c11475942390d20c4bdd2230d4afff6a7273fdbc5b2ad87b28df66f SHA512 610b6a4d2d707a3ba11b5a2604354814d50a267877698b6ca8214102cba8eb3a544a09803c1b4a55c65a954df9fbfea59ad6c434387b458d26bf7ebad0927474 WHIRLPOOL 82cb2c9f8f1ba4bc79ed57b3f1954f31138bb12d71ca210377adb82f59ff1f1a6d99b91fd1e28d1b83a3f56b4af3857875861b8030d019bbf65f701b45662dc8
|
||||
EBUILD docker-compose-1.5.2.ebuild 1886 SHA256 590623461c11475942390d20c4bdd2230d4afff6a7273fdbc5b2ad87b28df66f SHA512 610b6a4d2d707a3ba11b5a2604354814d50a267877698b6ca8214102cba8eb3a544a09803c1b4a55c65a954df9fbfea59ad6c434387b458d26bf7ebad0927474 WHIRLPOOL 82cb2c9f8f1ba4bc79ed57b3f1954f31138bb12d71ca210377adb82f59ff1f1a6d99b91fd1e28d1b83a3f56b4af3857875861b8030d019bbf65f701b45662dc8
|
||||
EBUILD docker-compose-1.6.2.ebuild 1999 SHA256 cf5111b5c196fae84b1d96f369fc552c5d33448b17d9647ff8a75badbc7e707b SHA512 d20dff1f36238746e8caa8b5970ba13e01e2d15bf15e8dccea70c814de0940e0c6a3b181fc54362109e0563fc9253fd8d4e8699d8542b50e90e3e255fb1931af WHIRLPOOL 9469d4a4e60fd907aaa17857702d022435c6e311a0c6f712e7e029ee3fa47e79f2c107421198bbdaf15659ac23a64217f6aef74437354b5808d4d7dbb1919d1a
|
||||
MISC ChangeLog 3499 SHA256 4d5a312b11061fd8acef399fd8db800887511edbb2944c2ba0fe6f0c38d9cd19 SHA512 1944fcd772a261232126ca2ca24dc89d769a1629ab71eb0bb920926fdac12efc2912a4694b1b8df9a32d55b9b16c6a0f457bdadf5c608fdb5bac521086b18dec WHIRLPOOL f64141362e343875be1c618853cfa4473ff7be5ab09d89357367f839419bce231842ebcf7307e3fc8af86c889bea6fec3015eac5316541db62fea22582d53efa
|
||||
MISC ChangeLog-2015 2025 SHA256 99d6e79498f6ded8f176505dc856af7ebdd6438420ba91eb9b5595c347c51660 SHA512 4a37f3d9387d314439e7a67b0faae778694b3acda4bf3dcdf62b2a46d71ef1f9391211c92e277188b5056504cf66fca6cc2c7b3d0ef119681485461dcec4e29a WHIRLPOOL 6151151ad2fde1389fbeeab773696918ed5957f015f7346a1a7c6547ced6423ecbe8494e48961c0dab905a63ad4b8801da0da8d8d84f9e0d679813f2d4ee495f
|
||||
MISC metadata.xml 383 SHA256 e5d0eac78bad3d9402eb68072839ac513d1fdca53e88d10a828d479042ba2eaa SHA512 3d49ce76ab751a7553011703f7fc2e360a04ee615756dfcefeccd529537dca1fc7dee35ae854efadbfac14c9f082ce3d4c962dc007c1f159c23679ca20470894 WHIRLPOOL b9fee754a32b8174c646aef21eead42b5cbfc8eba9000a1da8f1c163da5805155fc6d22ed9e3865a155fe3e309162b424b618e348886ad495f89e5a7443d3e95
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
DIST spice-protocol-0.12.10.tar.bz2 103029 SHA256 788f0d7195bec5b14371732b562eb55ca82712aab12273b0e87529fb30532efb SHA512 4f6545ced78a4eedf6adca3f10d536a57205626e631d7cf380be4ea08ca2e1fbbe32566e59c2ce1900a7f057a6dab044483b8423885280cbf142b253d8e03711 WHIRLPOOL 224348a06c6116070119de7fc700dc0d3bf3be271b3043d0ebb01200958b145282bbbfee48f2a9ceb2f719bf631832b431a2af5ae6c8a09bc60640336cab5274
|
||||
DIST spice-protocol-0.12.11.tar.bz2 72691 SHA256 22bae438bfb6c3245b195755c3f55e72c1f2bfae6f39c905b576fcb6c79b6330 SHA512 748217f8e3e5d13e14429d6a963737ecbe545b1fc700efb875e74a83b9a8f98d9d8a8917a65ba3c49f69b478af7a995e708689033663e6354692c50c39f108f3 WHIRLPOOL e0d6efbb9677e9f53901cca9059e355cf1d63b15917335d5c66a2101ad347447061c17e33ffa638c012d9db3c3eac2d69903527e06ce49ce219ab69deb51c7d4
|
||||
EBUILD spice-protocol-0.12.10.ebuild 379 SHA256 36fcad9eb16c2b05d320c87a010eef4967b33def0a4584861662fd6dea0a913c SHA512 38c268d7c9903dece47dd42291efb5d70ce18fdcd369eac175cd32cb065b533f0bd32c7f060ea7e15cdd2abfa5adeae67573f601b0a4994cad4db391ce125961 WHIRLPOOL b673dbaeaea5fe21da22c655a262c7555954269dca635279b531fe412c52f10989b9147091936efe4cad0acb8bb32cf4405afb265b884d796bd1a2c839e12e59
|
||||
EBUILD spice-protocol-0.12.11.ebuild 386 SHA256 83e0f7aed8eac68fa4ce2243aa2a1f1dce185f2cb1316a279e11cc72f7f5215d SHA512 00e80a6065991887ba8eec8c090491170862c6c39ea4e0e7a6e58393eacb6f9acb47fe024c7a7c085f81e2b460603abe108019387b12dbfda6596bfc079d4515 WHIRLPOOL bb8857268abf3bf35dba66d7f242862fc823ae0377474725b6c6ee66ae82686eeb895b2ba5b5584ebf512b190be6e727cf285a8746daa382e74e43966d7bc13e
|
||||
EBUILD spice-protocol-9999.ebuild 619 SHA256 7a841aa906597bc6203e53a9ebbd7aae970f182ada224d3197a4d9940f29294b SHA512 39a6a74d603b05a3e4e8ffea9a97e80a797c596bdda3ecadbe627d57f64e98087fe3bc7bb5f8eb94b522cb9413d1ac3df1c9e5148f67ead40cd223b16ca3ade5 WHIRLPOOL f9cc7364aff4d890b315c6ba6a8611145ea7839b6740c08f4c4f226fc5168fc96fe7efd0abd38d5b4ef9373b81081ec975ccdbe401f1e4eef5c4807b2f5b0b0e
|
||||
MISC ChangeLog 5742 SHA256 82b889f38f93b6217e84aec3c099c2fbd064b5376b9853369c3f901169c97629 SHA512 8873504c308d1ef35da18b9a9c24b9f7094a13c33891fb261580f855e3cc1405d196652511d2d8b1b9d8f7f0bb5559f7f6fa40a135cc41d4125dd461f3f0b426 WHIRLPOOL 76575a33e1b614ec92cb80f09e2c61d7d9ae3bc6b548b30554a97c81d93e6eaed6c311f26504b3ed03596bb01d27a232f3eb4ba60519a34255b95c2da0d986f8
|
||||
MISC ChangeLog 5923 SHA256 4acbba12f0c487ed1cedfaf89536b85a5cc8fb0e7a11de4a5d0186618975ed1b SHA512 018182a3d1fd7b9cad9ed6301493370053277bc07a7eba1e6cdeed57c7355432973a88234922aab12b15742e3961ef14e594367d754ee1046aa35e206cc130fc WHIRLPOOL ed10cc4eb4c6669205da7cf069fb133b931055cd126645c27102957d11a5b77c0354d1d274a98f0644a3eb0f266426043f6a7141d42f47e72c07054a1dcd965c
|
||||
MISC ChangeLog-2015 6113 SHA256 7fcca09d4ad157cb4f6722f938025fc41ab255158baa603b8e94f513eacb175f SHA512 78960a6ef6486b2d326a8479f0f431905199d6af0cd9eb023bd25ac1d4f4ba55a58db8b24fd379cab844154f30ad46dfbf197a0636e6662ec88ceba736ecee1c WHIRLPOOL 73f844c53a36fd957f905212801a09b3fb5294f05d8db919e2ffdcdac46801ccdfe07a557ec66495bb8de7c24aa93d8d54d51464329dd926af271e3015c86850
|
||||
MISC metadata.xml 392 SHA256 d71716d2383aa9ab43cbdde172b26662566a8c0eb8529efc728de9354ec3a6d9 SHA512 94b90de5debbe7d9e443a927854adaaf76315248af06f781e2e00b6232b0a33605479f9c29c5f78ae6527407382b3dedfc02ebfb579c884f0e82237e339a8b22 WHIRLPOOL 941723ce22812137b4a6788f04fc1d26ba9e33a44b817790143a6aa05e9a602a5e26905bf8c95ef2cf303e341b4ae43ee377905925c83bce1943de34ae0b8188
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Headers defining the SPICE protocol"
|
||||
HOMEPAGE="http://spice-space.org/"
|
||||
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
@ -0,0 +1,43 @@
|
||||
Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
|
||||
--- a/vmblock-only/linux/dentry.c 2015-02-07 03:11:55.000000000 +0300
|
||||
+++ c/vmblock-only/linux/dentry.c 2015-02-24 03:58:06.038605919 +0300
|
||||
@@ -32,7 +32,11 @@
|
||||
#include "block.h"
|
||||
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||||
static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
|
||||
+#else
|
||||
+static int DentryOpRevalidate(struct dentry *dentry, unsigned int);
|
||||
+#endif
|
||||
|
||||
struct dentry_operations LinkDentryOps = {
|
||||
.d_revalidate = DentryOpRevalidate,
|
||||
@@ -58,9 +62,12 @@
|
||||
*----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-static int
|
||||
-DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating
|
||||
- struct nameidata *nd) // IN: lookup flags & intent
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||||
+static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd)
|
||||
+#else
|
||||
+static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags)
|
||||
+#endif
|
||||
+
|
||||
{
|
||||
VMBlockInodeInfo *iinfo;
|
||||
struct nameidata actualNd;
|
||||
@@ -101,7 +108,11 @@
|
||||
if (actualDentry &&
|
||||
actualDentry->d_op &&
|
||||
actualDentry->d_op->d_revalidate) {
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
|
||||
+ return actualDentry->d_op->d_revalidate(actualDentry, flags);
|
||||
+#else
|
||||
return actualDentry->d_op->d_revalidate(actualDentry, nd);
|
||||
+#endif
|
||||
}
|
||||
|
||||
if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
|
||||
@ -0,0 +1,94 @@
|
||||
Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
|
||||
Properly initializes UID/GID with repsect to namespaces
|
||||
Some changes the readlink/setlink APIs
|
||||
--- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.000000000 +0300
|
||||
+++ c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300
|
||||
@@ -35,9 +35,15 @@
|
||||
|
||||
|
||||
/* Inode operations */
|
||||
-static struct dentry *InodeOpLookup(struct inode *dir,
|
||||
- struct dentry *dentry, struct nameidata *nd);
|
||||
+
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||||
+static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd);
|
||||
static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
|
||||
+#else
|
||||
+static struct dentry *InodeOpLookup(struct inode *, struct dentry *, unsigned int);
|
||||
+static int InodeOpReadlink(struct dentry *, char __user *, int);
|
||||
+#endif
|
||||
+
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
||||
#else
|
||||
@@ -49,12 +55,15 @@
|
||||
.lookup = InodeOpLookup,
|
||||
};
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
|
||||
static struct inode_operations LinkInodeOps = {
|
||||
+#else
|
||||
+struct inode_operations LinkInodeOps = {
|
||||
+#endif
|
||||
.readlink = InodeOpReadlink,
|
||||
.follow_link = InodeOpFollowlink,
|
||||
};
|
||||
|
||||
-
|
||||
/*
|
||||
*----------------------------------------------------------------------------
|
||||
*
|
||||
@@ -75,7 +84,11 @@
|
||||
static struct dentry *
|
||||
InodeOpLookup(struct inode *dir, // IN: parent directory's inode
|
||||
struct dentry *dentry, // IN: dentry to lookup
|
||||
- struct nameidata *nd) // IN: lookup intent and information
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||||
+ struct nameidata *nd) // IN: lookup intent and information
|
||||
+#else
|
||||
+ unsigned int flags)
|
||||
+#endif
|
||||
{
|
||||
char *filename;
|
||||
struct inode *inode;
|
||||
@@ -135,7 +148,12 @@
|
||||
inode->i_size = INODE_TO_IINFO(inode)->nameLen;
|
||||
inode->i_version = 1;
|
||||
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||||
inode->i_uid = inode->i_gid = 0;
|
||||
+#else
|
||||
+ inode->i_gid = make_kgid(current_user_ns(), 0);
|
||||
+ inode->i_uid = make_kuid(current_user_ns(), 0);
|
||||
+#endif
|
||||
inode->i_op = &LinkInodeOps;
|
||||
|
||||
d_add(dentry, inode);
|
||||
@@ -177,7 +195,12 @@
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
||||
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
|
||||
+ return vfs_readlink(dentry, buffer, buflen, iinfo->name);
|
||||
+#else
|
||||
+ return readlink_copy(buffer, buflen, iinfo->name);
|
||||
+#endif
|
||||
+
|
||||
}
|
||||
|
||||
|
||||
@@ -221,7 +244,7 @@
|
||||
goto out;
|
||||
}
|
||||
|
||||
- ret = vfs_follow_link(nd, iinfo->name);
|
||||
+ nd_set_link(nd, iinfo->name);
|
||||
|
||||
out:
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
@@ -230,3 +253,4 @@
|
||||
return ret;
|
||||
#endif
|
||||
}
|
||||
+
|
||||
@ -0,0 +1,57 @@
|
||||
The API to create proc entries now takes the file ops structure directly, instead of being set after the fact
|
||||
Using new __getname/__putname API
|
||||
--- a/vmblock-only/linux/control.c 2015-02-07 03:11:55.000000000 +0300
|
||||
+++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300
|
||||
@@ -208,9 +208,11 @@
|
||||
VMBlockSetProcEntryOwner(controlProcMountpoint);
|
||||
|
||||
/* Create /proc/fs/vmblock/dev */
|
||||
- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
|
||||
- VMBLOCK_CONTROL_MODE,
|
||||
- controlProcDirEntry);
|
||||
+ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
|
||||
+ VMBLOCK_CONTROL_MODE,
|
||||
+ controlProcDirEntry,
|
||||
+ &ControlFileOps);
|
||||
+
|
||||
if (!controlProcEntry) {
|
||||
Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
|
||||
remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
|
||||
@@ -218,7 +220,10 @@
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
|
||||
controlProcEntry->proc_fops = &ControlFileOps;
|
||||
+#endif
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -287,18 +287,24 @@ ExecuteBlockOp(const char __user *buf,
|
||||
int i;
|
||||
int retval;
|
||||
|
||||
- name = getname(buf);
|
||||
+ name = __getname();
|
||||
if (IS_ERR(name)) {
|
||||
return PTR_ERR(name);
|
||||
}
|
||||
|
||||
+ i = strncpy_from_user(name, buf, PATH_MAX);
|
||||
+ if (i < 0 || i == PATH_MAX) {
|
||||
+ __putname(name);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {
|
||||
name[i] = '\0';
|
||||
}
|
||||
|
||||
retval = i < 0 ? -EINVAL : blockOp(name, blocker);
|
||||
|
||||
- putname(name);
|
||||
+ __putname(name);
|
||||
|
||||
return retval;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
Hushes a warning
|
||||
--- a/vmmon-only/linux/driver.c 2015-02-07 03:54:16.000000000 +0300
|
||||
+++ c/vmmon-only/linux/driver.c 2015-02-24 03:58:06.042605293 +0300
|
||||
@@ -1328,7 +1328,9 @@
|
||||
*-----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-__attribute__((always_inline)) static Bool
|
||||
+#include <linux/compiler-gcc.h>
|
||||
+
|
||||
+__always_inline static Bool
|
||||
LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
|
||||
{
|
||||
TSCDelta tscDelta;
|
||||
@ -0,0 +1,41 @@
|
||||
replaces usage of vfs_readdir with iterate_dir. origionally found here:
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=508204
|
||||
|
||||
diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
|
||||
--- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -0500
|
||||
+++ vmblock-only/linux/file.c 2014-04-26 10:58:03.062635343 -0400
|
||||
@@ -166,11 +166,9 @@
|
||||
|
||||
static int
|
||||
FileOpReaddir(struct file *file, // IN
|
||||
- void *dirent, // IN
|
||||
- filldir_t filldir) // IN
|
||||
+ struct dir_context *ctx)
|
||||
{
|
||||
int ret;
|
||||
- FilldirInfo info;
|
||||
struct file *actualFile;
|
||||
|
||||
if (!file) {
|
||||
@@ -184,11 +182,8 @@
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- info.filldir = filldir;
|
||||
- info.dirent = dirent;
|
||||
-
|
||||
actualFile->f_pos = file->f_pos;
|
||||
- ret = vfs_readdir(actualFile, Filldir, &info);
|
||||
+ ret = iterate_dir(actualFile, ctx);
|
||||
file->f_pos = actualFile->f_pos;
|
||||
|
||||
return ret;
|
||||
@@ -237,7 +232,7 @@
|
||||
|
||||
|
||||
struct file_operations RootFileOps = {
|
||||
- .readdir = FileOpReaddir,
|
||||
+ .iterate = FileOpReaddir,
|
||||
.open = FileOpOpen,
|
||||
.release = FileOpRelease,
|
||||
};
|
||||
@ -0,0 +1,53 @@
|
||||
simply remove the code for Filldir since it is no longer used with the new
|
||||
iterate_dir API
|
||||
|
||||
diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
|
||||
--- vmblock-only/linux/file.c 2014-10-07 23:22:46.832469618 -0400
|
||||
+++ vmblock-only.new/linux/file.c 2014-10-07 23:24:35.276472720 -0400
|
||||
@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
|
||||
typedef ino_t inode_num_t;
|
||||
#endif
|
||||
|
||||
-/* Specifically for our filldir_t callback */
|
||||
-typedef struct FilldirInfo {
|
||||
- filldir_t filldir;
|
||||
- void *dirent;
|
||||
-} FilldirInfo;
|
||||
-
|
||||
-
|
||||
-/*
|
||||
- *----------------------------------------------------------------------------
|
||||
- *
|
||||
- * Filldir --
|
||||
- *
|
||||
- * Callback function for readdir that we use in place of the one provided.
|
||||
- * This allows us to specify that each dentry is a symlink, but pass through
|
||||
- * everything else to the original filldir function.
|
||||
- *
|
||||
- * Results:
|
||||
- * Original filldir's return value.
|
||||
- *
|
||||
- * Side effects:
|
||||
- * Directory information gets copied to user's buffer.
|
||||
- *
|
||||
- *----------------------------------------------------------------------------
|
||||
- */
|
||||
-
|
||||
-static int
|
||||
-Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir
|
||||
- const char *name, // IN: Dirent name
|
||||
- int namelen, // IN: len of dirent's name
|
||||
- loff_t offset, // IN: Offset
|
||||
- inode_num_t ino, // IN: Inode number of dirent
|
||||
- unsigned int d_type) // IN: Type of file
|
||||
-{
|
||||
- FilldirInfo *info = buf;
|
||||
-
|
||||
- /* Specify DT_LNK regardless */
|
||||
- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
|
||||
-}
|
||||
-
|
||||
-
|
||||
/* File operations */
|
||||
|
||||
/*
|
||||
@ -0,0 +1,46 @@
|
||||
removing the no longer existing second parameter to sk_data_ready
|
||||
doesn't seem it ever served a purpose.
|
||||
|
||||
diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
|
||||
--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500
|
||||
+++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400
|
||||
@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
|
||||
vsk = vsock_sk(sk);
|
||||
PKT_FIELD(vsk, sentWaitingRead) = FALSE;
|
||||
#endif
|
||||
-
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
||||
+ sk->sk_data_ready(sk);
|
||||
+#else
|
||||
sk->sk_data_ready(sk, 0);
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
|
||||
--- vsock-only/linux/notifyQState.c 2013-11-05 23:33:27.000000000 -0500
|
||||
+++ vsock-only.new/linux/notifyQState.c 2014-10-05 23:46:33.231303931 -0400
|
||||
@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
|
||||
struct sockaddr_vm *dst, // IN: unused
|
||||
struct sockaddr_vm *src) // IN: unused
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
||||
+ sk->sk_data_ready(sk);
|
||||
+#else
|
||||
sk->sk_data_ready(sk, 0);
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
|
||||
}
|
||||
|
||||
/* See the comment in VSockVmciNotifyPktSendPostEnqueue */
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
|
||||
+ sk->sk_data_ready(sk);
|
||||
+#else
|
||||
sk->sk_data_ready(sk, 0);
|
||||
+#endif
|
||||
}
|
||||
|
||||
return err;
|
||||
@ -0,0 +1,25 @@
|
||||
Hushes some (but not all warnings) relating to redefinitions of this define
|
||||
--- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.000000000 +0300
|
||||
+++ c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 +0300
|
||||
@@ -53,7 +53,9 @@
|
||||
* VMware HD Audio codec
|
||||
* VMware HD Audio controller
|
||||
*/
|
||||
+#ifndef PCI_VENDOR_ID_VMWARE
|
||||
#define PCI_VENDOR_ID_VMWARE 0x15AD
|
||||
+#endif
|
||||
#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
|
||||
#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
|
||||
#define PCI_DEVICE_ID_VMWARE_VGA 0x0711
|
||||
--- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.000000000 +0300
|
||||
+++ c/vmnet-only/vm_device_version.h 2015-02-24 03:58:06.044604981 +0300
|
||||
@@ -53,7 +53,9 @@
|
||||
* VMware HD Audio codec
|
||||
* VMware HD Audio controller
|
||||
*/
|
||||
+#ifndef PCI_VENDOR_ID_VMWARE
|
||||
#define PCI_VENDOR_ID_VMWARE 0x15AD
|
||||
+#endif
|
||||
#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
|
||||
#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
|
||||
#define PCI_DEVICE_ID_VMWARE_VGA 0x0711
|
||||
@ -0,0 +1,24 @@
|
||||
A copy of this since it is no longer exported by the kernel headers
|
||||
--- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.000000000 +0300
|
||||
+++ c/vmblock-only/shared/compat_namei.h 2015-02-24 03:51:25.235286047 +0300
|
||||
@@ -21,6 +21,20 @@
|
||||
|
||||
#include <linux/namei.h>
|
||||
|
||||
+/* Copy-n-paste from kernel's source/fs/namei.c */
|
||||
+struct nameidata {
|
||||
+ struct path path;
|
||||
+ struct qstr last;
|
||||
+ struct path root;
|
||||
+ struct inode *inode; /* path.dentry.d_inode */
|
||||
+ unsigned int flags;
|
||||
+ unsigned seq, m_seq;
|
||||
+ int last_type;
|
||||
+ unsigned depth;
|
||||
+ struct file *base;
|
||||
+ char *saved_names[MAX_NESTED_LINKS + 1];
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
|
||||
* struct. They were both replaced with a struct path.
|
||||
@ -0,0 +1,67 @@
|
||||
Sources:
|
||||
https://531682.bugs.gentoo.org/attachment.cgi?id=396484
|
||||
https://531682.bugs.gentoo.org/attachment.cgi?id=396482
|
||||
diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
|
||||
--- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.000000000 -0500
|
||||
+++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -0500
|
||||
@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
|
||||
unsigned int flags) // IN: lookup flags & intent
|
||||
{
|
||||
VMBlockInodeInfo *iinfo;
|
||||
- struct nameidata actualNd;
|
||||
+ struct path actualNd;
|
||||
struct dentry *actualDentry;
|
||||
int ret;
|
||||
|
||||
diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
|
||||
--- vmblock-only.orig/linux/filesystem.c 2014-11-20 19:29:15.000000000 -0500
|
||||
+++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -0500
|
||||
@@ -322,7 +322,7 @@ Iget(struct super_block *sb, // IN: f
|
||||
{
|
||||
VMBlockInodeInfo *iinfo;
|
||||
struct inode *inode;
|
||||
- struct nameidata actualNd;
|
||||
+ struct path actualNd;
|
||||
|
||||
ASSERT(sb);
|
||||
|
||||
diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
|
||||
--- vmblock-only.orig/shared/compat_namei.h 2014-11-20 19:29:15.000000000 -0500
|
||||
+++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -0500
|
||||
@@ -26,21 +26,21 @@
|
||||
* struct. They were both replaced with a struct path.
|
||||
*/
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
|
||||
-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
|
||||
+#define compat_vmw_nd_to_dentry(nd) (nd).dentry
|
||||
#else
|
||||
#define compat_vmw_nd_to_dentry(nd) (nd).dentry
|
||||
#endif
|
||||
|
||||
/* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
|
||||
-#define compat_path_release(nd) path_put(&(nd)->path)
|
||||
+#define compat_path_release(nd) path_put(nd)
|
||||
#else
|
||||
#define compat_path_release(nd) path_release(nd)
|
||||
#endif
|
||||
|
||||
/* path_lookup was removed in 2.6.39 merge window VFS merge */
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
|
||||
-#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path))
|
||||
+#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd)
|
||||
#else
|
||||
#define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)
|
||||
#endif
|
||||
diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
|
||||
--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500
|
||||
+++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -0500
|
||||
@@ -92,7 +92,7 @@
|
||||
* and that would try to acquire the inode's semaphore; if the two inodes
|
||||
* are the same we'll deadlock.
|
||||
*/
|
||||
- if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
|
||||
+ if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
|
||||
Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
|
||||
if (filp_close(actualFile, current->files) < 0) {
|
||||
Warning("FileOpOpen: unable to close opened file.\n");
|
||||
@ -0,0 +1,59 @@
|
||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
||||
--- a/vmci-only/linux/vmciKernelIf.c 2015-02-07 03:11:55.000000000 +0300
|
||||
+++ c/vmci-only/linux/vmciKernelIf.c 2015-02-24 03:58:06.041605450 +0300
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <linux/socket.h> /* For memcpy_{to,from}iovec(). */
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/wait.h>
|
||||
+#include <linux/skbuff.h>
|
||||
|
||||
#include "compat_highmem.h"
|
||||
#include "compat_interrupt.h"
|
||||
@@ -1196,21 +1197,21 @@
|
||||
} else {
|
||||
toCopy = size - bytesCopied;
|
||||
}
|
||||
-
|
||||
+ /* Code cloned from kernels drivers/misc/vmw_vmci/vmci_queue_pair.c */
|
||||
if (isIovec) {
|
||||
- struct iovec *iov = (struct iovec *)src;
|
||||
- int err;
|
||||
+ struct msghdr *msg = (struct msghdr *)src;
|
||||
+ int err;
|
||||
|
||||
- /* The iovec will track bytesCopied internally. */
|
||||
- err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy);
|
||||
- if (err != 0) {
|
||||
- if (kernelIf->host) {
|
||||
- kunmap(kernelIf->u.h.page[pageIndex]);
|
||||
+ /* The iovec will track bytes_copied internally. */
|
||||
+ err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy);
|
||||
+ if (err != 0) {
|
||||
+ if (kernelIf->host)
|
||||
+ kunmap(kernelIf->u.h.page[pageIndex]);
|
||||
+ return VMCI_ERROR_INVALID_ARGS;
|
||||
}
|
||||
- return VMCI_ERROR_INVALID_ARGS;
|
||||
- }
|
||||
- } else {
|
||||
- memcpy((uint8 *)va + pageOffset, (uint8 *)src + bytesCopied, toCopy);
|
||||
+ } else {
|
||||
+ memcpy((u8 *)va + pageOffset,
|
||||
+ (u8 *)src + bytesCopied, toCopy);
|
||||
}
|
||||
|
||||
bytesCopied += toCopy;
|
||||
@@ -1273,11 +1274,11 @@
|
||||
}
|
||||
|
||||
if (isIovec) {
|
||||
- struct iovec *iov = (struct iovec *)dest;
|
||||
+ struct msghdr *msg = (struct msghdr *)dest;
|
||||
int err;
|
||||
|
||||
/* The iovec will track bytesCopied internally. */
|
||||
- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
|
||||
+ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
|
||||
if (err != 0) {
|
||||
if (kernelIf->host) {
|
||||
kunmap(kernelIf->u.h.page[pageIndex]);
|
||||
@ -0,0 +1,25 @@
|
||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
||||
diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
|
||||
--- vsock-only.old/linux/af_vsock.c 2015-05-06 20:41:47.684046762 -0400
|
||||
+++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
|
||||
@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
|
||||
* able to send.
|
||||
*/
|
||||
|
||||
- written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
|
||||
+ written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
|
||||
len - totalWritten, 0);
|
||||
if (written < 0) {
|
||||
err = -ENOMEM;
|
||||
@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
|
||||
}
|
||||
|
||||
if (flags & MSG_PEEK) {
|
||||
- read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
|
||||
+ read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
|
||||
} else {
|
||||
- read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
|
||||
+ read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
|
||||
}
|
||||
|
||||
if (read < 0) {
|
||||
@ -0,0 +1,16 @@
|
||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
|
||||
--- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400
|
||||
+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400
|
||||
@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
|
||||
}
|
||||
|
||||
/* Place the datagram payload in the user's iovec. */
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
|
||||
err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
|
||||
+#else
|
||||
+ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
|
||||
+#endif
|
||||
if (err) {
|
||||
goto out;
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
|
||||
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
|
||||
--- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400
|
||||
+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400
|
||||
@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
|
||||
goto out;
|
||||
}
|
||||
|
||||
- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
|
||||
+ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
|
||||
|
||||
dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
|
||||
dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);
|
||||
@ -0,0 +1,61 @@
|
||||
--- vsock-only/linux/af_vsock.c 2015-05-03 00:55:58.955156116 +0200
|
||||
+++ vsock-only/linux/af_vsock.c.new 2015-05-03 01:01:14.305173750 +0200
|
||||
@@ -233,14 +233,10 @@
|
||||
static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
|
||||
char __user *optval, int __user * optlen);
|
||||
|
||||
-static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
|
||||
- struct socket *sock, struct msghdr *msg, size_t len);
|
||||
-static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
|
||||
- struct msghdr *msg, size_t len, int flags);
|
||||
-static int VSockVmciStreamSendmsg(struct kiocb *kiocb,
|
||||
- struct socket *sock, struct msghdr *msg, size_t len);
|
||||
-static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
|
||||
- struct msghdr *msg, size_t len, int flags);
|
||||
+static int VSockVmciDgramSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
|
||||
+static int VSockVmciDgramRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);
|
||||
+static int VSockVmciStreamSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
|
||||
+static int VSockVmciStreamRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);
|
||||
|
||||
static int VSockVmciCreate(
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
|
||||
@@ -4211,8 +4207,7 @@
|
||||
*/
|
||||
|
||||
static int
|
||||
-VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED
|
||||
- struct socket *sock, // IN: socket to send on
|
||||
+VSockVmciDgramSendmsg(struct socket *sock, // IN: socket to send on
|
||||
struct msghdr *msg, // IN: message to send
|
||||
size_t len) // IN: length of message
|
||||
{
|
||||
@@ -4541,8 +4536,7 @@
|
||||
*/
|
||||
|
||||
static int
|
||||
-VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
|
||||
- struct socket *sock, // IN: socket to send on
|
||||
+VSockVmciStreamSendmsg(struct socket *sock, // IN: socket to send on
|
||||
struct msghdr *msg, // IN: message to send
|
||||
size_t len) // IN: length of message
|
||||
{
|
||||
@@ -4710,8 +4704,7 @@
|
||||
*/
|
||||
|
||||
static int
|
||||
-VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED
|
||||
- struct socket *sock, // IN: socket to receive from
|
||||
+VSockVmciDgramRecvmsg(struct socket *sock, // IN: socket to receive from
|
||||
struct msghdr *msg, // IN/OUT: message to receive into
|
||||
size_t len, // IN: length of receive buffer
|
||||
int flags) // IN: receive flags
|
||||
@@ -4803,8 +4796,7 @@
|
||||
*/
|
||||
|
||||
static int
|
||||
-VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
|
||||
- struct socket *sock, // IN: socket to receive from
|
||||
+VSockVmciStreamRecvmsg(struct socket *sock, // IN: socket to receive from
|
||||
struct msghdr *msg, // IN/OUT: message to receive into
|
||||
size_t len, // IN: length of receive buffer
|
||||
int flags) // IN: receive flags
|
||||
@ -0,0 +1,56 @@
|
||||
--- vmci-only/linux/driver.c 2015-02-07 01:11:55.000000000 +0100
|
||||
+++ vmci-only/linux/driver.c.new 2015-07-23 00:28:25.713804866 +0200
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/poll.h>
|
||||
#include <linux/smp.h>
|
||||
+#include <linux/vmalloc.h>
|
||||
|
||||
#include "compat_highmem.h"
|
||||
#include "compat_interrupt.h"
|
||||
--- vmblock-only/linux/inode.c 2015-08-23 00:34:11.959377109 +0200
|
||||
+++ vmblock-only/linux/inode.c.new 2015-08-23 00:37:49.839389292 +0200
|
||||
@@ -38,7 +38,9 @@
|
||||
static int InodeOpReadlink(struct dentry *, char __user *, int);
|
||||
#endif
|
||||
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
||||
+static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
|
||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
||||
#else
|
||||
static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
||||
@@ -203,13 +205,19 @@
|
||||
*----------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
||||
+static const char *
|
||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
static void *
|
||||
#else
|
||||
static int
|
||||
#endif
|
||||
InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
||||
+ void **cookie) // OUT: stores opaque pointer
|
||||
+#else
|
||||
struct nameidata *nd) // OUT: stores result
|
||||
+#endif
|
||||
{
|
||||
int ret;
|
||||
VMBlockInodeInfo *iinfo;
|
||||
@@ -226,7 +234,11 @@
|
||||
goto out;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
||||
+ return *cookie = iinfo->name;
|
||||
+#else
|
||||
nd_set_link(nd, iinfo->name);
|
||||
+#endif
|
||||
|
||||
out:
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
@ -0,0 +1,22 @@
|
||||
--- vmnet-only/vmnetInt.h 2015-05-28 01:46:53.023206897 +0200
|
||||
+++ vmnet-only/vmnetInt.h.new 2015-05-28 01:47:07.911207730 +0200
|
||||
@@ -79,7 +79,7 @@
|
||||
extern struct proto vmnet_proto;
|
||||
#ifdef VMW_NETDEV_HAS_NET
|
||||
# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
|
||||
- PF_NETLINK, _pri, &vmnet_proto)
|
||||
+ PF_NETLINK, _pri, &vmnet_proto, 0)
|
||||
#else
|
||||
# define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1)
|
||||
#endif
|
||||
--- vsock-only/linux/af_vsock.c 2015-05-28 01:50:03.553217551 +0200
|
||||
+++ vsock-only/linux/af_vsock.c.new 2015-05-28 01:54:55.248233862 +0200
|
||||
@@ -2829,7 +2829,7 @@
|
||||
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
|
||||
sk = sk_alloc(vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1);
|
||||
#else
|
||||
- sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto);
|
||||
+ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 0);
|
||||
#endif
|
||||
if (!sk) {
|
||||
return NULL;
|
||||
@ -0,0 +1,27 @@
|
||||
diff -ru work.old/vmci-only/linux/driver.c work/vmci-only/linux/driver.c
|
||||
--- work.old/vmci-only/linux/driver.c 2015-09-14 21:07:49.751696932 +0200
|
||||
+++ work/vmci-only/linux/driver.c 2015-09-14 22:10:48.015908198 +0200
|
||||
@@ -2467,8 +2467,6 @@
|
||||
static void __exit
|
||||
vmci_exit(void)
|
||||
{
|
||||
- int retval;
|
||||
-
|
||||
if (guestDeviceInit) {
|
||||
pci_unregister_driver(&vmci_driver);
|
||||
vfree(data_buffer);
|
||||
@@ -2480,12 +2478,8 @@
|
||||
|
||||
VMCI_HostCleanup();
|
||||
|
||||
- retval = misc_deregister(&linuxState.misc);
|
||||
- if (retval) {
|
||||
- Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
|
||||
- } else {
|
||||
- Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
|
||||
- }
|
||||
+ misc_deregister(&linuxState.misc);
|
||||
+ Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
|
||||
|
||||
hostDeviceInit = FALSE;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
diff -ru work.old/vmmon-only/linux/driver.c work/vmmon-only/linux/driver.c
|
||||
--- work.old/vmmon-only/linux/driver.c 2015-08-14 22:39:49.000000000 +0200
|
||||
+++ work/vmmon-only/linux/driver.c 2015-09-14 22:11:06.807909249 +0200
|
||||
@@ -387,9 +387,7 @@
|
||||
#ifdef VMX86_DEVEL
|
||||
unregister_chrdev(linuxState.major, linuxState.deviceName);
|
||||
#else
|
||||
- if (misc_deregister(&linuxState.misc)) {
|
||||
- Warning("Module %s: error unregistering\n", linuxState.deviceName);
|
||||
- }
|
||||
+ misc_deregister(&linuxState.misc);
|
||||
#endif
|
||||
|
||||
Log("Module %s: unloaded\n", linuxState.deviceName);
|
||||
@ -0,0 +1,56 @@
|
||||
--- vmblock-only/linux/inode.c 2016-01-30 19:13:04.019947435 +0100
|
||||
+++ vmblock-only/linux/inode.c.new 2016-01-30 19:13:56.226950354 +0100
|
||||
@@ -44,7 +44,9 @@
|
||||
static int InodeOpReadlink(struct dentry *, char __user *, int);
|
||||
#endif
|
||||
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
||||
+static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, void **cookie);
|
||||
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
||||
static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
|
||||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
|
||||
static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
|
||||
@@ -63,7 +65,11 @@
|
||||
struct inode_operations LinkInodeOps = {
|
||||
#endif
|
||||
.readlink = InodeOpReadlink,
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
||||
+ .get_link = InodeOpFollowlink,
|
||||
+#else
|
||||
.follow_link = InodeOpFollowlink,
|
||||
+#endif
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -231,6 +237,9 @@
|
||||
static int
|
||||
#endif
|
||||
InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
||||
+ struct inode *inode,
|
||||
+#endif
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
|
||||
void **cookie) // OUT: stores opaque pointer
|
||||
#else
|
||||
@@ -241,12 +250,20 @@
|
||||
VMBlockInodeInfo *iinfo;
|
||||
|
||||
if (!dentry) {
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
||||
+ ret = -ECHILD;
|
||||
+#else
|
||||
Warning("InodeOpReadlink: invalid args from kernel\n");
|
||||
ret = -EINVAL;
|
||||
+#endif
|
||||
goto out;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
|
||||
+ iinfo = INODE_TO_IINFO(inode);
|
||||
+#else
|
||||
iinfo = INODE_TO_IINFO(dentry->d_inode);
|
||||
+#endif
|
||||
if (!iinfo) {
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
|
||||
index f1f4b10..c43242f 100644
|
||||
--- a/vmmon-only/linux/hostif.c
|
||||
+++ b/vmmon-only/linux/hostif.c
|
||||
@@ -55,6 +55,7 @@
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/wait.h>
|
||||
|
||||
+#include <asm/apic.h>
|
||||
|
||||
#include "vmware.h"
|
||||
#include "x86apic.h"
|
||||
@ -0,0 +1,89 @@
|
||||
diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
|
||||
index b21dd44..960c2aa 100644
|
||||
--- a/vmmon-only/linux/driver.c
|
||||
+++ b/vmmon-only/linux/driver.c
|
||||
@@ -178,7 +178,16 @@ static struct vm_operations_struct vmuser_mops = {
|
||||
#endif
|
||||
};
|
||||
|
||||
-static struct file_operations vmuser_fops;
|
||||
+static struct file_operations vmuser_fops = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .poll = LinuxDriverPoll,
|
||||
+ .unlocked_ioctl = LinuxDriver_Ioctl,
|
||||
+ .compat_ioctl = LinuxDriver_Ioctl,
|
||||
+ .open = LinuxDriver_Open,
|
||||
+ .release = LinuxDriver_Close,
|
||||
+ .mmap = LinuxDriverMmap
|
||||
+};
|
||||
+
|
||||
static struct timer_list tscTimer;
|
||||
static Atomic_uint32 tsckHz;
|
||||
static VmTimeStart tsckHzStartTime;
|
||||
@@ -357,21 +372,6 @@ init_module(void)
|
||||
linuxState.fastClockPriority = -20;
|
||||
linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE;
|
||||
|
||||
- /*
|
||||
- * Initialize the file_operations structure. Because this code is always
|
||||
- * compiled as a module, this is fine to do it here and not in a static
|
||||
- * initializer.
|
||||
- */
|
||||
-
|
||||
- memset(&vmuser_fops, 0, sizeof vmuser_fops);
|
||||
- vmuser_fops.owner = THIS_MODULE;
|
||||
- vmuser_fops.poll = LinuxDriverPoll;
|
||||
- vmuser_fops.unlocked_ioctl = LinuxDriver_Ioctl;
|
||||
- vmuser_fops.compat_ioctl = LinuxDriver_Ioctl;
|
||||
- vmuser_fops.open = LinuxDriver_Open;
|
||||
- vmuser_fops.release = LinuxDriver_Close;
|
||||
- vmuser_fops.mmap = LinuxDriverMmap;
|
||||
-
|
||||
#ifdef VMX86_DEVEL
|
||||
devel_init_module();
|
||||
linuxState.minor = 0;
|
||||
diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
|
||||
index b12b982..40bd4cf 100644
|
||||
--- a/vmnet-only/driver.c
|
||||
+++ b/vmnet-only/driver.c
|
||||
@@ -165,7 +165,16 @@ static long VNetFileOpUnlockedIoctl(struct file * filp,
|
||||
unsigned int iocmd, unsigned long ioarg);
|
||||
#endif
|
||||
|
||||
-static struct file_operations vnetFileOps;
|
||||
+static struct file_operations vnetFileOps = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .read = VNetFileOpRead,
|
||||
+ .write = VNetFileOpWrite,
|
||||
+ .poll = VNetFileOpPoll,
|
||||
+ .unlocked_ioctl = VNetFileOpUnlockedIoctl,
|
||||
+ .compat_ioctl = VNetFileOpUnlockedIoctl,
|
||||
+ .open = VNetFileOpOpen,
|
||||
+ .release = VNetFileOpClose
|
||||
+};
|
||||
|
||||
/*
|
||||
* Utility functions
|
||||
@@ -476,22 +491,6 @@ init_module(void)
|
||||
goto err_proto;
|
||||
}
|
||||
|
||||
- /*
|
||||
- * Initialize the file_operations structure. Because this code is always
|
||||
- * compiled as a module, this is fine to do it here and not in a static
|
||||
- * initializer.
|
||||
- */
|
||||
-
|
||||
- memset(&vnetFileOps, 0, sizeof vnetFileOps);
|
||||
- vnetFileOps.owner = THIS_MODULE;
|
||||
- vnetFileOps.read = VNetFileOpRead;
|
||||
- vnetFileOps.write = VNetFileOpWrite;
|
||||
- vnetFileOps.poll = VNetFileOpPoll;
|
||||
- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
|
||||
- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
|
||||
- vnetFileOps.open = VNetFileOpOpen;
|
||||
- vnetFileOps.release = VNetFileOpClose;
|
||||
-
|
||||
retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
|
||||
if (retval) {
|
||||
LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",
|
||||
@ -0,0 +1,65 @@
|
||||
diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
|
||||
index ab7a727..e3ec9d2 100644
|
||||
--- a/vmblock-only/Makefile.kernel
|
||||
+++ b/vmblock-only/Makefile.kernel
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
INCLUDE += -I$(SRCROOT)/include
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
|
||||
diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
|
||||
index ba343ee..861ea83 100644
|
||||
--- a/vmci-only/Makefile.kernel
|
||||
+++ b/vmci-only/Makefile.kernel
|
||||
@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
|
||||
|
||||
INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
obj-m += $(DRIVER).o
|
||||
|
||||
diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
|
||||
index 8770d1d..c4746c3 100644
|
||||
--- a/vmmon-only/Makefile.kernel
|
||||
+++ b/vmmon-only/Makefile.kernel
|
||||
@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
|
||||
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
|
||||
-I$(SRCROOT)/vmcore
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
|
||||
|
||||
diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
|
||||
index d1e3133..665d428 100644
|
||||
--- a/vmnet-only/Makefile.kernel
|
||||
+++ b/vmnet-only/Makefile.kernel
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
INCLUDE := -I$(SRCROOT)
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
|
||||
diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
|
||||
index b4629ee..264b8cb 100644
|
||||
--- a/vsock-only/Makefile.kernel
|
||||
+++ b/vsock-only/Makefile.kernel
|
||||
@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
|
||||
INCLUDE += -I$(SRCROOT)/linux
|
||||
INCLUDE += -I$(SRCROOT)/common
|
||||
|
||||
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
|
||||
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
|
||||
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
|
||||
|
||||
|
||||
@ -0,0 +1,85 @@
|
||||
diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
|
||||
index 2b81323..746c8b8 100644
|
||||
--- a/vmblock-only/Makefile
|
||||
+++ b/vmblock-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmblock
|
||||
PRODUCT := ws
|
||||
diff --git a/vmci-only/Makefile b/vmci-only/Makefile
|
||||
index 8e9c5be..6ec828b 100644
|
||||
--- a/vmci-only/Makefile
|
||||
+++ b/vmci-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmci
|
||||
PRODUCT := ws
|
||||
diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
|
||||
index 5bd867b..91a83d4 100644
|
||||
--- a/vmmon-only/Makefile
|
||||
+++ b/vmmon-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmmon
|
||||
PRODUCT := @@PRODUCT@@
|
||||
diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
|
||||
index d4eb73c..c7c6d38 100644
|
||||
--- a/vmnet-only/Makefile
|
||||
+++ b/vmnet-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vmnet
|
||||
PRODUCT := @@PRODUCT@@
|
||||
diff --git a/vsock-only/Makefile b/vsock-only/Makefile
|
||||
index 93dd61d..9765696 100644
|
||||
--- a/vsock-only/Makefile
|
||||
+++ b/vsock-only/Makefile
|
||||
@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
|
||||
ifdef LINUXINCLUDE
|
||||
HEADER_DIR = $(LINUXINCLUDE)
|
||||
else
|
||||
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
|
||||
+HEADER_DIR = $(KERNEL_DIR)
|
||||
endif
|
||||
|
||||
-BUILD_DIR = $(HEADER_DIR)/..
|
||||
+BUILD_DIR = $(KBUILD_OUTPUT)
|
||||
|
||||
DRIVER := vsock
|
||||
PRODUCT := ws
|
||||
@ -0,0 +1,24 @@
|
||||
diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
|
||||
index 7a56304..9ff4548 100644
|
||||
--- a/vmnet-only/compat_netdevice.h
|
||||
+++ b/vmnet-only/compat_netdevice.h
|
||||
@@ -47,6 +47,19 @@
|
||||
# define net_device device
|
||||
#endif
|
||||
|
||||
+/* it looks like these have been removed from the kernel 3.1
|
||||
+ * probably because the "transition" is considered complete.
|
||||
+ * so to keep this source compatible we just redefine them like they were
|
||||
+ * previously
|
||||
+ */
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
|
||||
+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
|
||||
+ functions are available. */
|
||||
+#define HAVE_FREE_NETDEV /* free_netdev() */
|
||||
+#define HAVE_NETDEV_PRIV /* netdev_priv() */
|
||||
+#define HAVE_NETIF_QUEUE
|
||||
+#define HAVE_NET_DEVICE_OPS
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue