Add win4lin

This commit is contained in:
Mario Fetka 2022-11-19 21:49:12 +01:00
parent 1bf994041f
commit dcd0ea6843
77 changed files with 3687 additions and 50 deletions

View File

@ -1,11 +1,11 @@
DIST insync-1.4.9.37127-fc25.i686.rpm 85130566 BLAKE2B 6edbb629ab57a3aac1ab715a0035e7b7094f55821c83129163ac6a8fb12e3a73b540983e8c63803f21b3337a5c09197465b63162ae70662799e6fcd8e6184a0a SHA512 297c232809ab1f4a117f4d8548e00769e872e1132f6161b0b6b6f456b001c47bcb28093efd4af8131eb0b4dfbd218888039bf51b04b9775e5a1718ad768984e6
DIST insync-3.7.11.50381-fc35.x86_64.rpm 150297060 BLAKE2B 06818e60c4ea84d59e83ed6f2d623b94d82209d0247ac3b3b814b95b5b64ea2b47303bff8d618f21d194a0e7b88397dee89ba400d0bcc40cdc19e56f8b5bf2ff SHA512 049e290354f7b92c7abd6f589914acb3cb462641d976944cc88edfd23df94efa78d6c15d92eaa8a590999e070ec0a696f9874d9a4891dedbace969a0fe0292cc
DIST insync-caja-3.4.2.40983-1.noarch.rpm 12886 BLAKE2B f49035bdafe51c11fb322fab99cc539c0ae939b6b4765adf49a18961a53f5b7ff80358280bffe24b49df54b13802e0e4260444b5ba817a001694aa7bb1a6987c SHA512 3fc31e5aab2081f30ab129deacb934217c80df0f3f82b90fab0d0e1db3d753253855f17f043cf3511ad4aa703aa55a172d7d718cf42be391542ba88c4d520691
DIST insync-dolphin-3.4.2.40983-1.noarch.rpm 44328 BLAKE2B b6ad5159ccb708493e7639f2621f35b80f3b0b89412a284de0f0d79fdd15121eca7e79e4ba098483105a9f6061b3d135f9a8d982dbb3f72e9c2fe4d005e312dd SHA512 a343160625923fcbbd55b5b17cca3b962b1ef11cb7ca25a5a20ece8efb7de5fd2b9ce1f69e8903096de7385b402dd487c3b94c7998059b91d45d8cf34fb946ca
DIST insync-3.7.14.50440-fc36.x86_64.rpm 156777551 BLAKE2B f8aa40b32bd2e4516b1c62b963d92cc7dcc12766914483aaf3790bcbfcafc9c5783a9a59f375f7fbbaeb704f4ffd6fb036d556b0fe3f7374df441bb37bf36b5e SHA512 c3509b92035c030ac09195684878d472173b459b41278119b8af2ffeec760d940fb5cffa36d9784834ba3c82650c0c6e626b2b9014071cb38cc3641acc2dc1db
DIST insync-caja-3.7.9.50368-1.noarch.rpm 12882 BLAKE2B 675abeb9119f7843f541be556c60d9b4fd4c478aa8d4c343ab4bb0cb00b286ed6c3742c19f0916e44ede8798f36fd8ced887ddf1bfa46ceeba6314b4053e9c57 SHA512 901ac54e0e8de39978e0558836fe846ee215b38d6e1f99f88b6a3f92b129aafbfe149cb75b9301556bd46f8f7c52b74067e0640abf1bfd2d1ab257b3c1c30246
DIST insync-dolphin-3.7.9.50368-1.noarch.rpm 44319 BLAKE2B 83acaa2083ccd5808b08e0577d68a37559eba31dcc0246d1a45fc5c4bf05665c2a7911389cd85e2876adb33b0b2efced85780c7e19320a12e144c9e4bc52a4e1 SHA512 cbca893944b529b680230e33f72ce02577c27438b54cc35fc285b3d78a1694c7ced623e14ef6b40bf5ec3a592077406dc3fb5c1df2cfd277d7294de9978c3b12
DIST insync-emblem-icons-3.4.2.40983-1.noarch.rpm 47745 BLAKE2B 5531f388f53576b8ed2a4ec1f3669274512680a21d320b220459f2e2c6fb0356d445e8e0f7afc5a794d85ba312a2a7ea2b53bb7481dde229f1fdd07cb067a0b3 SHA512 9d0c77411d133281fcefd05426da2a94c1c88172377a7e9bae31a2a697cb0f3d4a0d02282edaff1390bab8a2a60b709c331ac9007d5f620e8d83c24103b43a8e
DIST insync-nautilus-3.4.2.40983-1.noarch.rpm 14085 BLAKE2B 9acfc5cd81356a066e7e54676c48553b485df1cec3db93f284b2b6e15d7f4662c685436b7b2811c86cdae22e59bf1277c1d2bc6ab8317d5d6e6f86ba7e9a9856 SHA512 938b1fc2b8e0fa5c6f1227cebb624b95fa07bec8a1b34f0100466ad3ec49b00b141f2a3a334afc0b152d0796e4d1c664b9f2168632233a7dadfd0aa0a86e7cac
DIST insync-nemo-3.4.2.40983-1.noarch.rpm 12834 BLAKE2B f25731d07ccb7d5d0040bb74fc2f6634dbb9abcf33a1841839f4cd30779ce0c51dea83514bb68c6f2fcb0ac1b9899899776326f52abba6519b8eafd1fc05eaf7 SHA512 24ab72ba02b61dfc53812e5f2c23934e6e1a00bdf168bcb2dba9c66a43b4a47d914844e8f6b584414b8b45d4fad2197fdf8d23df14d236b61a11d6c1410ecb3d
DIST insync-nautilus-3.7.9.50368-1.noarch.rpm 14076 BLAKE2B 4cc19cc204e9897b515598e9c91a0b3bf07f7921b61976756085ecb299fb4ac1ee4d172189f21bec2fa281de8f079a35a042fab11f65bdf606e131252bfa634a SHA512 2a01c4626b9a09438a3021cc1c675f83f696121eead4c77417a53cd3dabfa5cbe4381fbbdb26e0920aea843cb5b4e7b8be8d459f18fe054d6413327cd006e5e5
DIST insync-nemo-3.7.9.50368-1.noarch.rpm 12829 BLAKE2B 33c798b1b927950561329876da7275886425d7fa46b095f2d44939109d7ab0068034c4a38c10ee7bbaca14ccf09efdff5ce34080005b35269715013cb7bfb81d SHA512 9809a46c13902a5d190c438386ad3e682332d03f6dc11ad30e74a55e49cfcf359e52a4c8f79ca21826037744c1e0e3119770629429eb2c7cea3a79a143fc898f
DIST insync-thunar-3.0.23.40579-1.x86_64.rpm 12661 BLAKE2B e8f0c473bad8b93e6464855fb2b3bf0d09118bf0bd75903a41852465000fcf96321d01268766900a4307960f388b4f15a8b28bfc0ab6c94a75f49d530f682d41 SHA512 74ab001160d30062da73b83c2cdafc6af2176ffda7856db98eb88305d71f6d07cc1a283b4a142cfb3138478900be0af6e946a6965bf2180f8ff86d3b5871df5f
EBUILD insync-3.7.11.50381.ebuild 2604 BLAKE2B 0ed109247e2d47851c3566b416d838988283643902542463ea35780f8ff89493f392854c7c25e0cabd560230db54597af504aca188444a6d12b4175eb6859dbc SHA512 aa83d72dfc335010aeced46d936b70083d5ea233591ca625e0627b65c517c8da627a262a45bc6d16268ebe28a9b294fb71304b41c2f07b9a58303d8b6210f049
EBUILD insync-3.7.14.50440.ebuild 2643 BLAKE2B 3ff792d6a32eece9d89aff1538bfbee3781704e66816ed770513b8b2ddefa214856315691aff2280c6d1d8b05e7a9845d850d112fb58985954434ac8ca08ef6e SHA512 988eb21396397d18eb9b86fa54b157794b1d1667eff90303be92a2d5a7c64ffca52b038664d09c1c650b4d0c3b229d3c401e2ff7ebd19285bae0b84114a9bcce
MISC ChangeLog 733 BLAKE2B e94a5cdc3ddef340cf4edd8c9d07c16bfc6f549516b82be6a5fcf4b1b770c57d65287c5ec9d3f2ac365d225a8398bb1b6f1542b9ead2e10308688ef2dd6b8567 SHA512 c9c277db795e6ce397608facfd5810aaf99dfef21277ca913494118856d9234949612cc707229798e8fc8e038e9201e84477f6c632bae02bcd704d4f6eb5b8e3
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c

View File

@ -7,22 +7,23 @@ inherit pax-utils rpm multilib xdg-utils
DESCRIPTION="Advanced cross-platform Google Drive client"
HOMEPAGE="https://www.insynchq.com/"
NAUTILUSPV="3.4.2.40983"
DOLPHINPV="3.4.2.40983"
NAUTILUSPV="3.7.9.50368"
DOLPHINPV="3.7.9.50368"
THUNARPV="3.0.23.40579"
NEMOPV="3.4.2.40983"
CAJAPV="3.4.2.40983"
NEMOPV="3.7.9.50368"
CAJAPV="3.7.9.50368"
EMBLEMPV="3.4.2.40983"
SRC_URI="
x86? ( http://s.insynchq.com/builds/insync-1.4.9.37127-fc25.i686.rpm )
amd64? ( http://yum.insync.io/fedora/35/x86_64/insync-${PV}-fc35.x86_64.rpm
http://yum.insync.io/fedora/35/noarch/insync-nautilus-${NAUTILUSPV}-1.noarch.rpm
http://yum.insync.io/fedora/35/noarch/insync-dolphin-${DOLPHINPV}-1.noarch.rpm
amd64? ( https://cdn.insynchq.com/builds/linux/insync-${PV}-fc36.x86_64.rpm
https://cdn.insynchq.com/builds/linux/insync-nautilus-${NAUTILUSPV}-1.noarch.rpm
https://cdn.insynchq.com/builds/linux/insync-dolphin-${DOLPHINPV}-1.noarch.rpm
http://yum.insync.io/fedora/35/noarch/insync-thunar-${THUNARPV}-1.x86_64.rpm
http://yum.insync.io/fedora/35/noarch/insync-nemo-${NEMOPV}-1.noarch.rpm
http://yum.insync.io/fedora/35/noarch/insync-caja-${CAJAPV}-1.noarch.rpm
https://cdn.insynchq.com/builds/linux/insync-nemo-${NEMOPV}-1.noarch.rpm
https://cdn.insynchq.com/builds/linux/insync-caja-${CAJAPV}-1.noarch.rpm
http://yum.insync.io/fedora/35/noarch/insync-emblem-icons-${EMBLEMPV}-1.noarch.rpm )"
LICENSE="no-source-code"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@ -65,6 +66,7 @@ src_prepare() {
src_install() {
dodir /opt
cp -a usr/lib/insync "${D}"/opt || die
rm "${D}"/opt/insync/libsndfile.so.1
dodir /usr
cp -a usr/share "${D}"/usr || die

View File

@ -0,0 +1,195 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit multibuild toolchain-funcs xdg
DESCRIPTION="The Versatile Commodore Emulator"
HOMEPAGE="https://vice-emu.sourceforge.io/"
SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE="
alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
REQUIRED_USE="
|| ( gtk headless sdl )
gtk? ( zlib )"
# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers
# see bug #834359 for the ffmpeg upper bound
RDEPEND="
virtual/libintl
app-emulation/opencbm
alsa? ( media-libs/alsa-lib )
ethernet? (
net-libs/libpcap
sys-libs/libcap
)
ffmpeg? ( <media-video/ffmpeg-5:= )
flac? ( media-libs/flac:= )
gif? ( media-libs/giflib:= )
gtk? (
dev-libs/atk
dev-libs/glib:2
media-libs/fontconfig:1.0
media-libs/glew:0=
sys-libs/readline:=
virtual/opengl
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3[X]
x11-libs/libX11
x11-libs/pango
)
jpeg? ( media-libs/libjpeg-turbo:= )
lame? ( media-sound/lame )
mpg123? ( media-sound/mpg123 )
ogg? (
media-libs/libogg
media-libs/libvorbis
)
parport? ( sys-libs/libieee1284 )
pci? ( sys-apps/pciutils )
png? ( media-libs/libpng:= )
portaudio? ( media-libs/portaudio )
pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) )
sdl? (
media-libs/libsdl2[video]
media-libs/sdl2-image
sys-libs/readline:=
)
zlib? ( sys-libs/zlib:= )"
DEPEND="
${RDEPEND}
x11-base/xorg-proto"
BDEPEND="
app-arch/unzip
app-text/dos2unix
dev-embedded/xa
dev-lang/perl
sys-apps/texinfo
sys-devel/flex
sys-devel/gettext
virtual/pkgconfig
virtual/yacc
doc? ( virtual/texi2dvi )
gtk? ( x11-misc/xdg-utils )"
QA_CONFIGURE_OPTIONS="--disable-static" #814380
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_prepare() {
default
# Strip the predefined C(XX)FLAGS.
sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
MULTIBUILD_VARIANTS=(
$(usev gtk)
$(usev headless)
$(usev sdl)
)
# Debug build currently broken without copy sources.
multibuild_copy_sources
}
src_configure() {
tc-export AR
multibuild_foreach_variant run_in_build_dir multibuild_src_configure
}
multibuild_src_configure() {
# Append ".variant" to x* programs if building multiple variants.
local xform
(( ${#MULTIBUILD_VARIANTS[@]} > 1 )) &&
xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
vice-multi_enable() {
if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
echo --enable-${2}
else
echo --disable-${2}
fi
}
local econfargs=(
--program-transform-name="${xform}"
$(vice-multi_enable gtk desktop-files)
$(vice-multi_enable gtk native-gtk3ui)
$(vice-multi_enable headless headlessui)
$(vice-multi_enable sdl sdlui2)
$(usex debug $(vice-multi_enable gtk debug-gtk3ui) --disable-debug-gtk3ui)
$(use_enable cpuhistory)
$(use_enable debug)
$(use_enable doc pdf-docs)
$(use_enable ethernet)
$(use_enable ffmpeg external-ffmpeg)
$(use_enable lame)
$(use_enable openmp)
$(use_enable parport libieee1284)
$(use_enable portaudio)
$(use_with alsa)
$(use_with flac)
$(use_with gif)
$(use_with jpeg)
$(use_with mpg123)
$(use_with ogg vorbis)
$(use_with oss)
$(use_with png)
$(use_with pulseaudio pulse)
$(use_with zlib)
$(usex alsa --enable-midi $(use_enable oss midi))
$(usev !pci ac_cv_header_pci_pci_h=no)
--disable-arch
--disable-sdlui
--enable-realdevice
ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif
# $(use_with curl libcurl) # new in 3.6 but is a unused placeholder
# --enable-io-simulation # likewise
)
econf "${econfargs[@]}"
}
src_compile() {
multibuild_foreach_variant run_in_build_dir emake
}
src_install() {
# Get xdg-desktop-menu to play nicely while doing the install.
dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
XDG_UTILS_INSTALL_MODE=system \
XDG_DATA_DIRS="${ED}"/usr/share \
XDG_CONFIG_DIRS="${ED}"/etc/xdg \
multibuild_foreach_variant run_in_build_dir default
rm -f "${ED}"/usr/share/applications/*.cache || die
vice-install_extras() {
docinto html
dodoc doc/html/*.{html,css}
dodoc -r doc/html/images
insinto /usr/share/vim/vimfiles/ftdetect
doins doc/vim/ftdetect/*.vim
insinto /usr/share/vim/vimfiles/syntax
doins doc/vim/syntax/*.vim
}
multibuild_for_best_variant run_in_build_dir vice-install_extras
}

View File

@ -0,0 +1,95 @@
# ChangeLog for app-emulation/win4lin
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/ChangeLog,v 1.19 2004/09/05 23:54:49 ciaranm Exp $
06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> win4lin-5.1.1.ebuild:
Switch to use epause and ebeep, bug #62950
*win4lin-5.1.1 (18 Mar 2004)
26 Aug 2004; José Alberto Suárez López <bass@gentoo.org> :
Updated to version 5.1.18c. Added new info to ebuild.
*win4lin-5.1 (18 Mar 2004)
29 Jun 2004; Aron Griffis <agriffis@gentoo.org> win4lin-5.0.1.ebuild,
win4lin-5.0.4.ebuild, win4lin-5.0.8.ebuild, win4lin-5.1.ebuild:
sync IUSE (-doc)
01 Jun 2004; Aron Griffis <agriffis@gentoo.org> win4lin-4.0.12.ebuild,
win4lin-4.0.16.ebuild, win4lin-4.0.20.ebuild, win4lin-4.0.22.ebuild,
win4lin-5.0.1.ebuild, win4lin-5.0.4.ebuild, win4lin-5.0.8.ebuild,
win4lin-5.1.ebuild:
Fix use invocation
18 Mar 2004; José Alberto Suárez López <bass@gentoo.org> win4lin-5.1.ebuild:
New version
30 Dec 2003; Sven Blumenstein <bazik@gentoo.org> win4lin-5.0.1.ebuild,
win4lin-5.0.4.ebuild, win4lin-5.0.8.ebuild:
Fixed a typo in all 5.x ebuilds which made repoman puke.
I wonder how these ebuilds got commited without repoman
blocking the commit...
*win4lin-5.0.8 (25 Oct 2003)
18 Mar 2004; José Alberto Suárez López <bass@gentoo.org> win4lin-5.0.8.ebuild:
Stable in x86
25 Oct 2003; José Alberto Suárez López <bass@gentoo.org> win4lin-5.0.8.ebuild:
New Version
*win4lin-5.0.4 (17 Aug 2003)
17 Aug 2003; J.Alberto Suárez L. <bass@gentoo.org> win4lin-5.0.4.ebuild:
New version.
This version has beta support to glibc-2.3.2.
*win4lin-5.0.1 (03 Jun 2003)
19 Jun 2003; J.Alberto Suárez L. <bass@gentoo.org> win4lin-5.0.1.ebuild:
Marked as stable.
03 Jun 2003; J.Alberto Suárez L. <bass@gentoo.org> win4lin-5.0.1.ebuild:
New version and new evaluation code.
*win4lin-4.0.22 (08 Jun 2003)
29 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
Added missing changelog entry.
*win4lin-4.0.20 (13 Apr 2003)
13 Apr 2003; J.Alberto Suárez L. <bass@gentoo.org> win4lin-4.0.20.ebuild:
new version
*win4lin-4.0.16 (02 Mar 2003)
02 Mar 2003; J.Alberto Suárez L. <bass@gentoo.org> win4lin-4.0.16.ebuild:
New version
*win4lin-4.0.12 (10 Jan 2002)
28 Feb 2002; Alastair Tse <liquidx@gentoo.org> win4lin-4.0.12.ebuild:
Updated IUSE field
10 Jan 2002; J.Alberto Suárez L. <bass@gentoo.org> win4lin-4.0.12.ebuild:
The next-generation :)
-Added evaluation-license
-The rpm is auto-fetched
-A lot of info
-USE doc flag to install docs
...
*win4lin-4.0.11 (16 Dec 2002)
16 Dec 2002; John Lennard <yakmoose@gentoo.org> win4lin-4.0.11.ebuild
Added execution of post-install and pre-remove, these are just the
originall Netraverse ones so far and many still need changing. Added a
config section to the ebuild also to install the Windows files.
12 Dec 2002; Seemant Kulleen <seemant@gentoo.org> win4lin-4.0.11.ebuild
files/digest-win4lin-4.0.11 ChangeLog :
Initial, preliminary ebuild for win4lin. Handing over to yakmoose@gentoo
for the finishing touches

View File

@ -0,0 +1,33 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
MD5 950f3e38720efa26ce4ce0cf951db012 win4lin-4.0.22.ebuild 2416
MD5 7c9a96588c1cbe8692e7fb3671f12bbd win4lin-5.0.8.ebuild 2815
MD5 3376c113f7d65f780aa0c02e54ef53a5 ChangeLog 3154
MD5 dd5c86e247c3e37d4cccb902604baf9f win4lin-5.0.4.ebuild 2815
MD5 397a65d54ae5dbe379e464912d39b9c5 win4lin-4.0.16.ebuild 2412
MD5 f2639a2fb529f818e5f0a89e93754489 win4lin-5.1.ebuild 2815
MD5 80df6097e8c9748b3cb41808ada21f86 metadata.xml 465
MD5 dff0eadb5df79743de992424e4c6a0b3 win4lin-4.0.12.ebuild 2412
MD5 83b6608bfa65495d967c7408d30b7cda win4lin-5.1.1.ebuild 3178
MD5 5628564e57bbf1ed9bad2771cbf15011 win4lin-4.0.20.ebuild 2411
MD5 9ff0d53144f3d3123cab081aa87f7fdf win4lin-5.0.1.ebuild 2816
MD5 f55a22f0e3747c4673f80d53803502f2 files/digest-win4lin-4.0.12 142
MD5 6e0fd7f874abc97d2186d2c99527d488 files/digest-win4lin-4.0.16 142
MD5 5fec029d8463ba33430ac0d42b4fc687 files/win4lin.initd.new 456
MD5 e910056949f5711c131f501e1fea8742 files/digest-win4lin-4.0.20 142
MD5 710ef99af4d9318d273c6596773de660 files/digest-win4lin-4.0.22 72
MD5 64806537e817b95e25bb98a6e1b67379 files/win4lin.initd 1677
MD5 799dd2399a061b88260b94b201e35107 files/digest-win4lin-5.0.8 71
MD5 baf7d82f65c984dda45ba34d32aac52f files/registerme.sh 327
MD5 a56d557323abbc90fb5aab4b4896b6a2 files/digest-win4lin-5.0.1 71
MD5 3653275db4219e37fdd58300140669ea files/digest-win4lin-5.0.4 71
MD5 7da856dbe813f4f7c0d4332456339448 files/digest-win4lin-5.1.1 72
MD5 9ee870309aa9caefa4449a3b6d2dff5d files/digest-win4lin-5.1 72
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBO6akLLFUmVNQ7rkRAi2dAKDVNEj+G7SKxuVg4ADMzUe89bNjBgCffh4y
81FNNhBr7hCXUkoWjwjbZSU=
=2zJT
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,13 @@
#!/bin/sh
echo 'Your license evaluation code is:'
echo '-> Win4Lin 4.x:'
echo ' 1w4e053x-n0aaf8-7tw9-587j-h47j-d6'
echo '-> Win4Lin 5.x'
echo ' 1w5e055x-n0ca34-xjhx-xx3c-4c3c-73'
echo
echo 'Remember you need do this in root mode.'
echo 'copy it and press a key to start the reg.'
read
sh /opt/win4lin/bin/ask_license.sh

View File

@ -0,0 +1,68 @@
#!/sbin/runscript
. /etc/mrgssv.sh
depend() {
after *
}
CLEAN_TMP() {
[ -z "${VARMERGE}" ] && return
find ${VARMERGE}/tmp -atime +1 -type f -exec rm {} \;
return
}
Work_Around() {
[ "_${SYSTEMTYPE} != "_linux" ] && return
# In certain situations on Linux systems, the Win4Lin installation
# script does not complete.
# If it looks like that situation then re-run the installation script
# and force the making of the images. (Even though the images should
# have been automatically created in this situation.)
# When the images are not there, but Windows files are loaded, then
# re-run the install script and then explicitly make images.
[ -r "${VARMERGE}"/image/std/mono/mono.img ] && return
[ ! -r "${VARMERGE}"/dosroot/wincabs/info.txt ] && return
# Don't continue if the modules are not loaded.
modules=`/sbin/lsmod|grep Mmerge`
[ "x$modules" = "x" ] && return
[ -r "${VARMERGE}"/postinst-running ] && return
touch "${VARMERGE}"/postinst-running
sh "${STATICMERGE}"/postinst_rpm.sh \
> "${VARMERGE}"/log/postinst-boot.log 2>&1
ls -l "${VARMERGE}"/image/std/* > "${VARMERGE}"/log/mkimg-boot.log 2>&1
/usr/bin/mkimg >> "${VARMERGE}"/log/mkimg-boot.log 2>&1
rm -f "${VARMERGE}"/postinst-running
}
start() {
if [ "_${SYSTEMTYPE}" != "_linux" ]
then
ebegin "Starting ${MERGENAME}"
else
ebegin "Starting ${MERGENAME}:"
CLEAN_TMP
sh ${STATICMERGE}mrg_setup.sh
Work_Around
eend $?
}
stop() {
if [ "_${SYSTEMTYPE}" != "_linux" ]
then
ebegin "Stopping ${MERGENAME}"
eend $?
return
fi
ebegin "Stopping ${MERGENAME}:"
( cd ${STATICMERGE}/drivers ; sh tools/unloadem )
${STATICMERGE}/rlockshm -r > /dev/null 2>&1
eend $?
}

View File

@ -0,0 +1,21 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/files/win4lin.initd.new,v 1.3 2004/07/14 21:24:52 agriffis Exp $
depend() {
need net
}
start() {
ebegin "Starting Win4Lin"
/etc/rc.d/init.d/Win4Lin start > /dev/null
eend $?
}
stop() {
ebegin "Stopping Win4Lin"
/etc/rc.d/init.d/Win4Lin stop > /dev/null
eend $?
}

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>no-herd</herd>
<maintainer>
<email>bass@gentoo.org</email>
<name>José Alberto Suárez López</name>
</maintainer>
<longdescription>
The NeTraverse product suite delivers the fastest and most cost-effective, resource-efficient, high-performance solution for running Windows applications on Linux.
</longdescription>
</pkgmetadata>

View File

@ -0,0 +1,79 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-4.0.12.ebuild,v 1.8 2004/06/24 22:36:33 agriffis Exp $
IUSE="doc"
MY_P=Win4Lin-5.3.12b-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively
under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm
doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="x86"
DEPEND="app-arch/rpm2targz
sys-kernel/win4lin-sources"
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
if use doc
then
dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
echo "LICENSE_CODE=1w4e053x-n0aaf8-7tw9-587j-h47j-d6" > /var/win4lin/install/license.lic
ln -s /etc/rc.d/init.d/Win4Lin /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -0,0 +1,79 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-4.0.16.ebuild,v 1.6 2004/06/24 22:36:33 agriffis Exp $
IUSE="doc"
MY_P=Win4Lin-5.3.16a-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively
under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm
doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="x86"
DEPEND="app-arch/rpm2targz
sys-kernel/win4lin-sources"
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
if use doc
then
dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
echo "LICENSE_CODE=1w4e053x-n0aaf8-7tw9-587j-h47j-d6" > /var/win4lin/install/license.lic
ln -s /etc/rc.d/init.d/Win4Lin /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -0,0 +1,79 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-4.0.20.ebuild,v 1.7 2004/06/24 22:36:33 agriffis Exp $
IUSE="doc"
MY_P=Win4Lin-5.3.20a-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively
under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm
doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="x86"
DEPEND="app-arch/rpm2targz
sys-kernel/win4lin-sources"
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
if use doc
then
dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
echo "LICENSE_CODE=1w4e053x-n0aaf8-7tw9-587j-h47j-d6" > /var/win4lin/install/license.lic
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
ln -s /etc/rc.d/init.d/Win4Lin /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -0,0 +1,79 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-4.0.22.ebuild,v 1.7 2004/06/24 22:36:33 agriffis Exp $
IUSE="doc"
MY_P=Win4Lin-5.3.22a-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively
under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm"
# doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="x86"
DEPEND="app-arch/rpm2targz
sys-kernel/win4lin-sources"
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
if use doc
then
dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
echo "LICENSE_CODE=1w4e053x-n0aaf8-7tw9-587j-h47j-d6" > /var/win4lin/install/license.lic
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
ln -s /etc/rc.d/init.d/Win4Lin /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -0,0 +1,88 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-5.0.1.ebuild,v 1.10 2004/06/30 03:19:34 agriffis Exp $
IUSE=""
MY_P=Win4Lin-5.5.1d-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively
under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm"
# doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="x86"
DEPEND="app-arch/rpm2targz
virtual/winkernel"
RDEPEND="!<=app-emulation/win4lin-4.0.22"
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
einfo "Remember you need a kernel patched like"
einfo "win4lin-sources or gs-sources."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
cp ${FILESDIR}/win4lin.initd.new ${D}/opt/win4lin/
# if use doc
# then
# dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
# fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
echo "LICENSE_CODE=1w5e055x-n0ca34-xjhx-xx3c-4c3c-73" > /var/win4lin/install/license.lic
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
einfo "============"
einfo "If this is an upgrade 4.x to 5.x the trial license code isn't valid,"
einfo "you need register it in NeTraverse, or unemerge ALL Win4Lin files."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
cp /opt/win4lin/win4lin.initd.new /etc/init.d/Win4Lin
chmod +x /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -0,0 +1,88 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-5.0.4.ebuild,v 1.9 2004/06/30 03:19:34 agriffis Exp $
IUSE=""
MY_P=Win4Lin-5.5.4d-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively
under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm"
# doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="x86"
DEPEND="app-arch/rpm2targz
virtual/winkernel"
RDEPEND="!<=app-emulation/win4lin-4.0.22"
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
einfo "Remember you need a kernel patched like"
einfo "win4lin-sources or gs-sources."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
cp ${FILESDIR}/win4lin.initd.new ${D}/opt/win4lin/
# if use doc
# then
# dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
# fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
echo "LICENSE_CODE=1w5e055x-n0ca34-xjhx-xx3c-4c3c-73" > /var/win4lin/install/license.lic
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
einfo "============"
einfo "If this is an upgrade 4.x to 5.x the trial license code isn't valid,"
einfo "you need register it in NeTraverse, or unemerge ALL Win4Lin files."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
cp /opt/win4lin/win4lin.initd.new /etc/init.d/Win4Lin
chmod +x /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -0,0 +1,88 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-5.0.8.ebuild,v 1.8 2004/06/30 03:19:34 agriffis Exp $
IUSE=""
MY_P=Win4Lin-5.5.8e-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively
under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm"
# doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="x86"
DEPEND="app-arch/rpm2targz
virtual/winkernel"
RDEPEND="!<=app-emulation/win4lin-4.0.22"
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
einfo "Remember you need a kernel patched like"
einfo "win4lin-sources or gs-sources."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
cp ${FILESDIR}/win4lin.initd.new ${D}/opt/win4lin/
# if use doc
# then
# dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
# fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
echo "LICENSE_CODE=1w5e055x-n0ca34-xjhx-xx3c-4c3c-73" > /var/win4lin/install/license.lic
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
einfo "============"
einfo "If this is an upgrade 4.x to 5.x the trial license code isn't valid,"
einfo "you need register it in NeTraverse, or unemerge ALL Win4Lin files."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
cp /opt/win4lin/win4lin.initd.new /etc/init.d/Win4Lin
chmod +x /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -0,0 +1,103 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-5.1.1.ebuild,v 1.2 2004/09/05 23:54:49 ciaranm Exp $
inherit eutils
IUSE=""
MY_P=Win4Lin-5.5.18c-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm"
# doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="x86"
DEPEND="app-arch/rpm2targz
virtual/winkernel
!app-emulation/win4lin"
pkg_setup() {
if has_version '<=app-emulation/win4lin-5.1'; then
echo
ewarn "You must unmerge older versions of win4lin first."
ewarn "Is a good idea to backup your license code too."
echo
die "blocked by older version"
epause
fi
}
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
einfo "Remember you need a kernel patched like"
einfo "win4lin-sources or gs-sources."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
cp ${FILESDIR}/win4lin.initd.new ${D}/opt/win4lin/
# if use doc
# then
# dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
# fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
echo "LICENSE_CODE=1w5e055x-n0ca34-xjhx-xx3c-4c3c-73" > /var/win4lin/install/license.lic
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
einfo "============"
einfo "If this is an upgrade 4.x to 5.x the trial license code isn't valid,"
einfo "you need register it in NeTraverse, or unemerge ALL Win4Lin files."
einfo "============"
ewarn "Remeber: rc-update add Win4Lin default"
ewarn "you need to start de Win4Lin service."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
cp /opt/win4lin/win4lin.initd.new /etc/init.d/Win4Lin
chmod +x /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -0,0 +1,88 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/win4lin/win4lin-5.1.ebuild,v 1.5 2004/06/30 03:19:34 agriffis Exp $
IUSE=""
MY_P=Win4Lin-5.5.16c-d.i386
S=${WORKDIR}
DESCRIPTION="Win4Lin allows you run Windows applications somewhat natively
under linux."
HOMEPAGE="http://www.netraverse.com/"
SRC_URI="mirror://gentoo/${MY_P}.rpm"
# doc? ( https://www.netraverse.com/support/docs/Win4Lin-4.0.0-manual.pdf )"
SLOT="0"
LICENSE="NeTraverse"
KEYWORDS="~x86"
DEPEND="app-arch/rpm2targz
virtual/winkernel"
RDEPEND="!<=app-emulation/win4lin-4.0.22"
src_unpack() {
rpm2targz ${DISTDIR}/${MY_P}.rpm
tar zxf ${WORKDIR}/${MY_P}.tar.gz
}
src_compile() {
einfo "nothing to compile; binary package."
einfo "Remember you need a kernel patched like"
einfo "win4lin-sources or gs-sources."
}
src_install() {
mv ${S}/opt ${D}
mv ${S}/etc ${D}
cp ${FILESDIR}/registerme.sh ${D}/opt/win4lin/
cp ${FILESDIR}/win4lin.initd.new ${D}/opt/win4lin/
# if use doc
# then
# dodoc ${DISTDIR}/Win4Lin-4.0.0-manual.pdf
# fi
}
pkg_postinst() {
/opt/win4lin/postinst_rpm.sh
echo "LICENSE_CODE=1w5e055x-n0ca34-xjhx-xx3c-4c3c-73" > /var/win4lin/install/license.lic
einfo "If this is a new Win4Lin Install you will need to run the following command"
einfo "ebuild /var/db/pkg/app-emulation/${PF}/${PF}.ebuild config"
einfo "to install the windows setup files. You will need your Windows cdrom in the "
einfo "drive in order to complete this step."
einfo "============"
einfo "If this is an upgrade 4.x to 5.x the trial license code isn't valid,"
einfo "you need register it in NeTraverse, or unemerge ALL Win4Lin files."
}
pkg_prerm() {
/opt/win4lin/remove_rpm.sh
}
pkg_config() {
loadwindowsCD cddevice /dev/cdrom
cp /opt/win4lin/win4lin.initd.new /etc/init.d/Win4Lin
chmod +x /etc/init.d/Win4Lin
#put debugging stuff here
if [ ${?} -eq "0" ]; then
einfo "You can now run the command \"installwindows\" from an xterm "
einfo "as a non-root user to install a personal copy of Windows that Win4Lin "
einfo "will use for that user."
einfo
einfo "Win4Lin is a commercial product, you now are using a evaluation-license"
einfo "for 15 days evaluation. If you want a extra 15 days of evaluation you"
einfo 'must run "sh /opt/win4lin/registerme.sh"'
einfo
einfo 'You can help Gentoo Linux and obatin a full license at a discont offer'
einfo 'for gentoo users in http://www.netraverse.com/gentoo.htm'
einfo 'Netraverse donate to Gentoo Linux a percent of each purchase.'
einfo 'Thanks Netraverse.'
einfo
einfo 'Remember, you must do "/etc/init.d/Win4Lin start" before start w4l'
einfo 'Also you can add it to default boot "rc-update add Win4Lin default"'
fi
}

View File

@ -2,10 +2,10 @@ AUX 10arduino-bin 69 BLAKE2B 7e420563bc46a63b26b1df1099b20f41acf45d1996cdccd77d5
AUX arduino.1 15213 BLAKE2B cb1c41c0a7345812344d41a55115f534e445b5c6f789309e8a9f422e76117d5f10d475692717dff377691098850248d6c3297dd1cbe517e4cbd28c6232ade713 SHA512 837cae1a434152ac507a0e229e384077392024d01db4d7b9d9820bfbe8877c4822c3f52467a7c02756c04958af9e8464925a254703d2ed9ca75b51e5e917f88a
AUX arduino.desktop 274 BLAKE2B 1a2ad9fc7bd99f2c4517713abc62135777767000c3c9bb8d03fb5a0a50a0315d0776c3efe4a1d8b4958eb963b19f85199435362947c85e7e37832c4570e2cc2b SHA512 d9c4f65b720ad0b6a5874e4fb6cf4c4ebccaf3e97451984c6aec75b3c83630e209be0c045c6b731c582ec78e47240006678f182fa1d671fc0459382755d8ac8c
DIST 00-teensy.rules 2062 BLAKE2B 18a4b4b23b4f6d948d8c337169bc9b08d22439674147baf5529ff8fe67f4323a5afc13ea0e8f9d292bc33e13134aa26fedb31f305b55a8ad1cbbeb818d49ad2b SHA512 27ccb822c01f84e955444f7b614caae732f8c61708060e5a5257906bcdf59dcaf1ee4811628715a3b1e472ccb38e415fbfc7b920457a9b444b4a7211f9022d70
DIST TeensyduinoInstall-156.linux32 95219640 BLAKE2B 56e0de4110ddb38b681bf2245f8428b071e3b4aaa53254a393d3c4c268e674d3fa86e7e545bedd79a86acedc51729435095db1030966cd838b6988f39743e389 SHA512 cff4edfe40d4c74793f90ac8d50205beefb7c44b02835a10bad0771c8f27b50bb4124e009ac8a447c9287cdecc49d5374fe0093346c8195baa6927eaa940e6db
DIST TeensyduinoInstall-156.linux64 95219640 BLAKE2B 56e0de4110ddb38b681bf2245f8428b071e3b4aaa53254a393d3c4c268e674d3fa86e7e545bedd79a86acedc51729435095db1030966cd838b6988f39743e389 SHA512 cff4edfe40d4c74793f90ac8d50205beefb7c44b02835a10bad0771c8f27b50bb4124e009ac8a447c9287cdecc49d5374fe0093346c8195baa6927eaa940e6db
DIST TeensyduinoInstall-157.linux32 91777396 BLAKE2B 277cf1f2957a30989f64d631a3fd3f89385b427b46eb3b251cea1843b586f713a588fec5f4bd37a482be93263df74d1d75e1089016abcac5fa17d84a0eaa2956 SHA512 a605174233ec4bede26113e2c54a4ad7a56592825785ef37beca6942c1357dd2d8c69e1f746f02035d120e695605a600f0c56e050cfcd8e78b9c78eea2a63a6b
DIST TeensyduinoInstall-157.linux64 91777396 BLAKE2B 277cf1f2957a30989f64d631a3fd3f89385b427b46eb3b251cea1843b586f713a588fec5f4bd37a482be93263df74d1d75e1089016abcac5fa17d84a0eaa2956 SHA512 a605174233ec4bede26113e2c54a4ad7a56592825785ef37beca6942c1357dd2d8c69e1f746f02035d120e695605a600f0c56e050cfcd8e78b9c78eea2a63a6b
DIST arduino-1.8.19-linux32.tar.xz 130946688 BLAKE2B 99fa0bef52224b2a358b6c3390981b13fcbfc1b0e64b5e5ad9bc7ffe498e3f11f5efbfe319e4d682e95f4e1735ffd8487b40b0f42dc84b77b010ef885897005f SHA512 b18d0fe8dbc3aaddb58706e1d2e87047d746357418bf3ea308ee388be0d83867bd08d54a1e7a96a239cb95e0b5733d7d68f23cf6585bb2aa7eeec55bf02544d1
DIST arduino-1.8.19-linux64.tar.xz 128583740 BLAKE2B 7e38710540e17dd407289654bb459ef5788e36d25cc6e71086e01cc0318aa75e6d8a15a171926274b60b3b181f7c685c22cd8d0ba2f49b2d4019fafaa777c4e2 SHA512 9328abf8778200019ed40d4fc0e6afb03a4cee8baaffbcea7dd3626477e14243f779eaa946c809fb153a542bf2ed60cf11a5f135c91ecccb1243c1387be95328
EBUILD arduino-bin-1.8.19.ebuild 1521 BLAKE2B 71e34f3f0acd66feb0cf8a7e72fa6e87cd6882751f264c0fa33178684907bc7e48784c5d8ebd6b8dee6c98365429ce3e9fa7df22d2e4776853aac1146a681c8f SHA512 556077a64342483c48d96ea23276d50a61dea7552a4cdf9693e85c79c3dd5d09c58cae8df12e63f801bcd9556d889bd3f9772232d48b3f814b0f1b7451d13a53
EBUILD arduino-bin-1.8.19-r1.ebuild 1521 BLAKE2B 35e5b5b4e8652837cdf37e59c17c38ed9bef21400a6a3f729ca69a5b208d3248c9d4a804852dde1594bca4917434a115e00b6594bf38779b69ec4ac526eb1b4c SHA512 16252bc52cc49c4b244c7725f5d716bb307db85e7247f9c9f0a67beea38cca63d8a26fffb8e3c3da2546ea7e9bc6b2fc84d031dfa6e781d81884e72f0c81fc83
MISC ChangeLog 261 BLAKE2B 3bd3a4abc94a7b3821033dff21f799b24125cd4c15aa5553f506fc16f6d0573ca32579f2b76d43b059552981d5078bd590d1acbd1cc84b19476b4d373ac9e3b1 SHA512 7b2fce01087e449eff734453aa339d4532f73206b112ada464310334ce5be1d2f38bc9778c7f68a068eae7e6fc7a6e1cf5a0be0caef5648f43615464dc695b0a
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c

View File

@ -7,7 +7,7 @@ inherit eutils udev desktop
DESCRIPTION="electronics prototyping platform based on easy-to-use hardware and software"
HOMEPAGE="https://www.arduino.cc/ https://www.pjrc.com/teensy/"
TEENSY_PV="156"
TEENSY_PV="157"
MY_PN="${PN/-bin}"
MY_P="${MY_PN}-${PV}"
SRC_URI="

View File

@ -1,3 +1,5 @@
AUX cc65-mrustc.patch 1007 BLAKE2B a1755003730fef8df2af5644585e8411cc2ca64a5572c86b8425157d3de37d4ccb915852ad3b8c502bfab536c796e6219aa73db8d0803c3bb23f0424a4df30e1 SHA512 ba3d4c10ddef6d7e977d68c6df24e20f7c2964aff9f98f527aa09575c31b9cb3d0c58255f630fc56dc8b1c33a8470b76c5d5f8ac8aab896a8116d802f5f1eb41
AUX mrustc-cc65.patch 10372 BLAKE2B d50da4c3fb8d2dc93f6581a5494636501afed87c8f2ca4bd45b2f06772fd01c5e4b43b04f68a3b4bd224876f872bde815b09afe88061926c03a678eddd9a95c4 SHA512 df653d8001117172ef90162b6e040b0a72d2737f30f448ff13c9d368006e6e8f96faec1576114d958173428d4829a66b8e82f154c7875e74dd4343f22da588b9
DIST cc65-sources-2.19.tar.gz 2284735 BLAKE2B c1c845417e38113c99a9ec8fbff1b90e292798582ac2b394e40419eff3eea62d838ea52165188516efc6157ef02aa7fc23c5a6510fd40d1012ad2b5231d78097 SHA512 e893359249588247d262ff19b8b7efbbcb10a274964aaa18cfe21830cce39da53831262bcc8ee4678158c0e0ab56905411b037699d1097aa5fc03edf7d6bea8f
EBUILD cc65-2.19.ebuild 1564 BLAKE2B 042c86577e8d47556505c70fc7fd1ab8cfad1b808627360a221bcd892e4ff5f8484f9ccf3cb1c2579962f359665826f0352739ac02c39cf9fa3df0fbb6a97c8b SHA512 4df5eb661a1239f372121c66f8e42ec3c5f7b978c0fdf5a42bd782b0f18840a6bda72757708b63162e9f648d61ecbec13884a12663633f6be53e3c38bc232e11
MISC ChangeLog 3554 BLAKE2B 69591f3bf392915244406476078889781f4cc22f05f1267f489086af3d2822db62a7fe3fed3453845d9e92a7ca5d129f8b134287a26d7245a8ae4326845c1835 SHA512 62fb31a4e177d616a286524bb021b847ccf8ca932b90f118fd8d899a46b236a75479e9f4098040e5e14fffa3cb4a7fdcf05fb1aae291071296de6c50a90095d2

View File

@ -0,0 +1,34 @@
From 4799c47cc89913d7a17ad36ffd6dd4a0ded7f0d6 Mon Sep 17 00:00:00 2001
From: Tibor Nagy <xnagytibor@gmail.com>
Date: Fri, 8 Feb 2019 16:33:07 +0100
Subject: [PATCH] Patches for mrustc
---
src/ca65/scanner.c | 2 +-
src/cc65/ident.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c
index f80fe2bca9..5822421daf 100644
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -647,7 +647,7 @@ int IsIdChar (int C)
return IsAlNum (C) ||
(C == '_') ||
(C == '@' && AtInIdents) ||
- (C == '$' && DollarInIdents);
+ (C == '$');
}
diff --git a/src/cc65/ident.c b/src/cc65/ident.c
index 7748095c7f..6836482257 100644
--- a/src/cc65/ident.c
+++ b/src/cc65/ident.c
@@ -50,5 +50,5 @@
int IsIdent (char c)
/* Return true if the given char may start an identifier */
{
- return (IsAlpha (c) || c == '_');
+ return (IsAlpha (c) || c == '_' || c == '$');
}

View File

@ -0,0 +1,208 @@
From c9cbda11fe60d76b0864a6e992170a0e8005c437 Mon Sep 17 00:00:00 2001
From: Tibor Nagy <xnagytibor@gmail.com>
Date: Fri, 8 Feb 2019 16:35:42 +0100
Subject: [PATCH] Patches for cc65
---
src/trans/codegen_c.cpp | 57 ++++++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 26 deletions(-)
diff --git a/src/trans/codegen_c.cpp b/src/trans/codegen_c.cpp
index 84a538d57..0ac6598ec 100644
--- a/src/trans/codegen_c.cpp
+++ b/src/trans/codegen_c.cpp
@@ -238,10 +238,10 @@ namespace {
{
case Compiler::Gcc:
m_of
- << "#include <stdatomic.h>\n" // atomic_*
+ //<< "#include <stdatomic.h>\n" // atomic_*
<< "#include <stdlib.h>\n" // abort
<< "#include <string.h>\n" // mem*
- << "#include <math.h>\n" // round, ...
+ //<< "#include <math.h>\n" // round, ...
<< "#include <setjmp.h>\n" // setjmp/jmp_buf
;
break;
@@ -282,7 +282,7 @@ namespace {
{
case Compiler::Gcc:
m_of
- << "extern void _Unwind_Resume(void) __attribute__((noreturn));\n"
+ << "static void _Unwind_Resume(void) { }\n"
<< "#define ALIGNOF(t) __alignof__(t)\n"
;
break;
@@ -299,10 +299,11 @@ namespace {
{
case Compiler::Gcc:
m_of
- << "extern __thread jmp_buf* mrustc_panic_target;\n"
- << "extern __thread void* mrustc_panic_value;\n"
+ << "extern jmp_buf* mrustc_panic_target;\n"
+ << "extern void* mrustc_panic_value;\n"
;
// 64-bit bit ops (gcc intrinsics)
+ /*
m_of
<< "static inline uint64_t __builtin_clz64(uint64_t v) {\n"
<< "\treturn (v >> 32 != 0 ? __builtin_clz(v>>32) : 32 + __builtin_clz(v));\n"
@@ -311,6 +312,7 @@ namespace {
<< "\treturn ((v&0xFFFFFFFF) == 0 ? __builtin_ctz(v>>32) + 32 : __builtin_ctz(v));\n"
<< "}\n"
;
+ */
break;
case Compiler::Msvc:
m_of
@@ -525,6 +527,7 @@ namespace {
else
{
// GCC-only
+ /*
m_of
<< "typedef unsigned __int128 uint128_t;\n"
<< "typedef signed __int128 int128_t;\n"
@@ -540,27 +543,29 @@ namespace {
<< "\treturn (v == 0 ? 128 : ((v&0xFFFFFFFFFFFFFFFF) == 0 ? __builtin_ctz64(v>>64) + 64 : __builtin_ctz64(v)));\n"
<< "}\n"
;
+ */
}
// Common helpers
m_of
<< "\n"
- << "static inline int slice_cmp(SLICE_PTR l, SLICE_PTR r) {\n"
+ << "static int slice_cmp(SLICE_PTR l, SLICE_PTR r) {\n"
<< "\tint rv = memcmp(l.PTR, r.PTR, l.META < r.META ? l.META : r.META);\n"
<< "\tif(rv != 0) return rv;\n"
<< "\tif(l.META < r.META) return -1;\n"
<< "\tif(l.META > r.META) return 1;\n"
<< "\treturn 0;\n"
<< "}\n"
- << "static inline SLICE_PTR make_sliceptr(void* ptr, size_t s) { SLICE_PTR rv = { ptr, s }; return rv; }\n"
- << "static inline TRAITOBJ_PTR make_traitobjptr(void* ptr, void* vt) { TRAITOBJ_PTR rv = { ptr, vt }; return rv; }\n"
+ << "static SLICE_PTR make_sliceptr(void* ptr, size_t s) { SLICE_PTR rv; rv.PTR = ptr; rv.META = s; return rv; }\n"
+ //<< "static TRAITOBJ_PTR make_traitobjptr(void* ptr, void* vt) { TRAITOBJ_PTR rv = { ptr, vt }; return rv; }\n"
<< "\n"
- << "static inline size_t mrustc_max(size_t a, size_t b) { return a < b ? b : a; }\n"
- << "static inline void noop_drop(tUNIT *p) { }\n"
+ << "static size_t mrustc_max(size_t a, size_t b) { return a < b ? b : a; }\n"
+ << "static void noop_drop(tUNIT *p) { }\n"
<< "\n"
// A linear (fast-fail) search of a list of strings
- << "static inline size_t mrustc_string_search_linear(SLICE_PTR val, size_t count, SLICE_PTR* options) {\n"
- << "\tfor(size_t i = 0; i < count; i ++) {\n"
+ << "static size_t mrustc_string_search_linear(SLICE_PTR val, size_t count, SLICE_PTR* options) {\n"
+ << "\tsize_t i = 0;\n"
+ << "\tfor(i = 0; i < count; i ++) {\n"
<< "\t\tint cmp = slice_cmp(val, options[i]);\n"
<< "\t\tif(cmp < 0) break;\n"
<< "\t\tif(cmp == 0) return i;\n"
@@ -583,7 +588,7 @@ namespace {
// TODO: Define this function in MIR.
if( is_executable )
{
- m_of << "int main(int argc, const char* argv[]) {\n";
+ m_of << "int main(int argc, char* argv[]) {\n";
auto c_start_path = m_resolve.m_crate.get_lang_item_path_opt("mrustc-start");
if( c_start_path == ::HIR::SimplePath() )
{
@@ -600,8 +605,8 @@ namespace {
if( m_compiler == Compiler::Gcc )
{
m_of
- << "__thread jmp_buf* mrustc_panic_target;\n"
- << "__thread void* mrustc_panic_value;\n"
+ << "jmp_buf* mrustc_panic_target;\n"
+ << "void* mrustc_panic_value;\n"
;
}
}
@@ -877,7 +882,7 @@ namespace {
emit_type_fn(ty); m_of << "\n";
)
else TU_IFLET( ::HIR::TypeRef::Data, ty.m_data, Array, te,
- m_of << "typedef struct "; emit_ctype(ty); m_of << " "; emit_ctype(ty); m_of << ";\n";
+ //m_of << "typedef struct "; emit_ctype(ty); m_of << " "; emit_ctype(ty); m_of << ";\n";
)
else TU_IFLET( ::HIR::TypeRef::Data, ty.m_data, Path, te,
TU_MATCHA( (te.binding), (tpb),
@@ -1154,7 +1159,7 @@ namespace {
if( true && repr->size > 0 && !has_unsized )
{
// TODO: Handle unsized (should check the size of the fixed-size region)
- m_of << "typedef char sizeof_assert_" << Trans_Mangle(p) << "[ (sizeof(struct s_" << Trans_Mangle(p) << ") == " << repr->size << ") ? 1 : -1 ];\n";
+ //m_of << "typedef char sizeof_assert_" << Trans_Mangle(p) << "[ (sizeof(struct s_" << Trans_Mangle(p) << ") == " << repr->size << ") ? 1 : -1 ];\n";
//m_of << "typedef char alignof_assert_" << Trans_Mangle(p) << "[ (ALIGNOF(struct s_" << Trans_Mangle(p) << ") == " << repr->align << ") ? 1 : -1 ];\n";
}
@@ -1226,7 +1231,7 @@ namespace {
m_of << "};\n";
if( true && repr->size > 0 )
{
- m_of << "typedef char sizeof_assert_" << Trans_Mangle(p) << "[ (sizeof(union u_" << Trans_Mangle(p) << ") == " << repr->size << ") ? 1 : -1 ];\n";
+ //m_of << "typedef char sizeof_assert_" << Trans_Mangle(p) << "[ (sizeof(union u_" << Trans_Mangle(p) << ") == " << repr->size << ") ? 1 : -1 ];\n";
}
// Drop glue (calls destructor if there is one)
@@ -1412,7 +1417,7 @@ namespace {
m_of << "};\n";
if( true && repr->size > 0 )
{
- m_of << "typedef char sizeof_assert_" << Trans_Mangle(p) << "[ (sizeof(struct e_" << Trans_Mangle(p) << ") == " << repr->size << ") ? 1 : -1 ];\n";
+ //m_of << "typedef char sizeof_assert_" << Trans_Mangle(p) << "[ (sizeof(struct e_" << Trans_Mangle(p) << ") == " << repr->size << ") ? 1 : -1 ];\n";
}
// ---
@@ -3526,7 +3531,7 @@ namespace {
if( (*ve)[i] == INT64_MIN )
m_of << "INT64_MIN";
else
- m_of << (*ve)[i] << "ll";
+ m_of << (*ve)[i] << "l";
m_of << ": "; cb(i); m_of << " break;\n";
}
m_of << indent << "\tdefault: "; cb(SIZE_MAX); m_of << "\n";
@@ -5441,17 +5446,17 @@ namespace {
case ::HIR::CoreType::I64:
case ::HIR::CoreType::Isize:
m_of << c.v;
- m_of << "ll";
+ m_of << "l";
break;
case ::HIR::CoreType::I128:
if( m_options.emulated_i128 )
{
- m_of << "make128s(" << c.v << "ll)";
+ m_of << "make128s(" << c.v << "l)";
}
else
{
m_of << c.v;
- m_of << "ll";
+ m_of << "l";
}
break;
default:
@@ -5474,16 +5479,16 @@ namespace {
break;
case ::HIR::CoreType::U64:
case ::HIR::CoreType::Usize:
- m_of << ::std::hex << "0x" << c.v << "ull" << ::std::dec;
+ m_of << ::std::hex << "0x" << c.v << "ul" << ::std::dec;
break;
case ::HIR::CoreType::U128:
if( m_options.emulated_i128 )
{
- m_of << "make128(" << ::std::hex << "0x" << c.v << "ull)" << ::std::dec;
+ m_of << "make128(" << ::std::hex << "0x" << c.v << "ul)" << ::std::dec;
}
else
{
- m_of << ::std::hex << "0x" << c.v << "ull" << ::std::dec;
+ m_of << ::std::hex << "0x" << c.v << "ul" << ::std::dec;
}
break;
case ::HIR::CoreType::Char:

View File

@ -1,4 +1,4 @@
DIST idafree80_linux.run 84651274 BLAKE2B 7fe61de1106589ce5939bee963c2e30061a700303fca02b3fa29574365991a08ed020d602baf84ee24364594812650f2985391f252988e71f60fa45b2042d8bc SHA512 0b96d4ba14e066db09e922d26f77e2635c66b53194e0a5b87e31fb42a93624cf9ba559c4f261e782e3755a31b6ff733eeb4900bca27c60a0c18449e8bfbec6c7
EBUILD idafree-8.0.ebuild 1271 BLAKE2B 65e651b7da9b75a7ab0ceb42bef26c6a69fef211b6ab138f4ea39ca72ff05d5e9e465a731709e681c6c911bb8683956f14d82708a926aa25e16262a8c11f3e27 SHA512 0f9fa4dd5c26239abe753a32e909b9075b0ba59fe2ef49d02cbeb122c1c891e7edfcc7aa920008eaf6399056eb9552a490416c6fdde422d29a1dd20ae28392e7
DIST idafree81_linux.run 84653313 BLAKE2B 6c159b92d5315eb3f3185404c8160c76dfe734c8d5ed3a98ef134c0ad7e16872157b5dffe55e0ea16d6b78b077f351cc6f6bcc9c5640889805e35c6436020877 SHA512 093bbb0cf8565926f19e551d1fa31056f3417b43b9a5c9206b0dde4a3bc8491c4100e8d8484ab704bdfaba4333aabb8405fbe1f5d8bac9dcfcedeb0ef5907eed
EBUILD idafree-8.1.ebuild 1271 BLAKE2B 65e651b7da9b75a7ab0ceb42bef26c6a69fef211b6ab138f4ea39ca72ff05d5e9e465a731709e681c6c911bb8683956f14d82708a926aa25e16262a8c11f3e27 SHA512 0f9fa4dd5c26239abe753a32e909b9075b0ba59fe2ef49d02cbeb122c1c891e7edfcc7aa920008eaf6399056eb9552a490416c6fdde422d29a1dd20ae28392e7
MISC ChangeLog 383 BLAKE2B 246acdb1c1c088630f1a19046b7bbca23170dd67fa1e400a7d44096a1403a668340952392903136074cf56c9bb85c7bb9cdfbe44db40de14c40b027813129b98 SHA512 347ac6697b7057e1500a6ed77c2a88648d9df3a74f6fa6119d81e3968ff12920e3adc0d3152c82fe202446ee60bb8edca76e94028a53c43a43d74b772fd1b417
MISC metadata.xml 411 BLAKE2B 6bd76e3591b8a2d88277f9ebfbd5951a7458a266adf5818533a1d829a770db62e1de41a4cb4f29206ed5eb381c6f4bfdc04973c4c65bd72496b7e31b6c85880f SHA512 df1f54923628bff824dc8835c96902bd07d4462472b9b8f356abb0b9b81875d78fa96e511290739ecc5423eadc8b2579a65b2f31f9c2c6a73c8d3413c0603d98

View File

@ -1,8 +1,12 @@
AUX makeresolvedeb_gentoo_1.6.0.patch 3462 BLAKE2B 8072b571bc370b9f0c7b3b62504c9b48f1dbda6e661e60082178244afd9c91e8e969f7d667e70a690066e4cb76c1d7c2425dbd781c5d3815e02663274be1eb07 SHA512 3cb9f7ba8b9a68dced129511e51f1842d81df77cbc98b4ad9b9f4e830d451ad0e8ece2d1dbadf1af636e5202f960b62331478de71466f19706c297ba847be9b8
AUX makeresolvedeb_gentoo_1.6.2.patch 3512 BLAKE2B f68296bc9ef210cdd9122f63e2825eb4b03bb992466614792b10409dab33a5bdf264059418776139260e0c9ef525da3c43d374cfa9d652695df0fe18d94f8126 SHA512 077bf903d2d5f7da51399eaedeb04fae20759793c6bf658c92e3a955f2294a90e247b7b64db5f93c45761de88287eef1c525174685b0f45d0c1cefc5d4ef0646
DIST DaVinci_Resolve_17.4.6_Linux.zip 2340066824 BLAKE2B 6e87a65f6657a8e9bd5cbcecb62b6dd74b45e4a8d6ae0d6e2aca6643d669a8aa49736e21e9826518897adbbf2d7f36d26bec402424158e4cb232560ab0c7ecdf SHA512 5067737e66d355d28aed34a5ff810ce552c6e8f07b9fcf1935cc7b2bfc65054de67e1a53c68560f58a60e3d63078bc47cba2c4257d0afaa3d76bfc50840a1409
DIST DaVinci_Resolve_18.0.3_Linux.zip 3128059839 BLAKE2B 2f7a3bc9fdcd2ae903e9898d884dbda10864a79ddeb25c7b1d6776d8e803085d35efb12024dcc4252891f917d55e37f09065c23be2b0b8738b7e36b9660daf95 SHA512 72feaf28feb48dfb54f6af07f46bd185d1b5ef074f957a21022908c1919dbca8fbcce3ff0046142ddab48b5a5c4f8d51530f10c88e64878557a65a28de30c830
DIST DaVinci_Resolve_18.0.4_Linux.zip 3128059055 BLAKE2B 707d55ff21c3d5fa95096c3bc3c4f2d90adc9f561b0e1445c12965c2a42fee8846f4536782640442730d226bfe3b9b819490f17f56ff77c3ea55e848a1c51c26 SHA512 ac31ae6f164c0e38c5a942c9ee222a33369fb56bdc9f8295b6e5727f7c441255cea88403c0537d3e4b3baefe366583ca5cb47c27f36afa3b70450d0c87517083
DIST DaVinci_Resolve_18.1_Linux.zip 3182942106 BLAKE2B 0ff2cbee1b781c6dcda7ee28ae823585beac7ee8269ee5e80bdaed2b75698f712a78f426ec5c744729cf9f96520f412762e367cd879de3cd6499d2578f3dec39 SHA512 ae11f469cdb84c611558364e46fef1dbb1aaf2508728a9b642127e7aec7edb62e8800896df94b20bcc82c7707800b3a2eb9cba8a7f920765531b847f6ab60463
DIST makeresolvedeb_1.6.0_multi.sh.tar.gz 4191 BLAKE2B ab2f09f339700ee31e011811152c6b97cc7e172698236efba0c0254cf69966c776dd222302e1da0266423f0af9c54ae426de4f5354d0d4550ae89b354f0a3d7a SHA512 02baae42c1e9d2163660b765ee6556660b337a3dfe25a60ee4bad9331d84700538ff9b339d045dd91cc0d89d1cd805e56437ae3a8d6ddf6502d0be0f0e5bc114
DIST makeresolvedeb_1.6.2_multi.sh.tar.gz 4258 BLAKE2B bcc2f602e9023f296b3dc69cb6cc04ea87001d51981a80eb3ffd2d4d5944e163a773a3a556b19fcb6e9a5b89f59c2e3535ae5f9f546068379888f982bf07d65d SHA512 b7afae27c4f2e9ab970ebbcc0f85427e36d6442883f9b6d616f85e78e256c91cc444ee714e0cb92167afed9340448464ab00118400bae9d929eaadc3110471f2
EBUILD davinci-resolve-17.4.6.ebuild 2467 BLAKE2B fb9de7cd7a13482dcfe42f8e6823179daf144c72d4b8a8024b5aa5f502288862848dacc52bbe40f565f91c04dc991aaf02d5a0ef95e9ac626847f95ffbb16780 SHA512 dbc71120a6131aac4eeb7ab48a67ec153fb9a38316ce38a581fd99cae7f7479daa08b1afc3a88a208fc7c034b13df87fab0c7b104219f391e74fec2ab39781c7
EBUILD davinci-resolve-18.0.3.ebuild 2467 BLAKE2B fb9de7cd7a13482dcfe42f8e6823179daf144c72d4b8a8024b5aa5f502288862848dacc52bbe40f565f91c04dc991aaf02d5a0ef95e9ac626847f95ffbb16780 SHA512 dbc71120a6131aac4eeb7ab48a67ec153fb9a38316ce38a581fd99cae7f7479daa08b1afc3a88a208fc7c034b13df87fab0c7b104219f391e74fec2ab39781c7
EBUILD davinci-resolve-18.0.4.ebuild 2467 BLAKE2B fb9de7cd7a13482dcfe42f8e6823179daf144c72d4b8a8024b5aa5f502288862848dacc52bbe40f565f91c04dc991aaf02d5a0ef95e9ac626847f95ffbb16780 SHA512 dbc71120a6131aac4eeb7ab48a67ec153fb9a38316ce38a581fd99cae7f7479daa08b1afc3a88a208fc7c034b13df87fab0c7b104219f391e74fec2ab39781c7
EBUILD davinci-resolve-18.1.ebuild 2467 BLAKE2B 314be23153ef0e50daf3e6c41b80f542fc14173c8c8867a7e44dc79d67c7cca97ddf7826c137d0cf6e73729ad98e866a08a1f7722b0f2804e081b0925079790b SHA512 bbe23d5ca42f0552e12f5ca71012c12fd6739fff1c59ec65066d560caf670133f5467a792c3393f2a75313af2e27f30bd2e51d51de5c4108e3fec237de24c16f
MISC ChangeLog 984 BLAKE2B 6b5afde0d34caa62f7a6e336c651652380e9144d8c3382dcca2ee680b85724d93deca09c903565ccd79987d39ed61c517f1a5e717f37d3b00d24ac95c038edf3 SHA512 8110c143fd18310b7f12b9eb575f5179a574f0941bf1d6978c96ff4887289ecabfc4c3ab5fb4a9125d9b9d5e65d9d430ebc349965b925ba0bd35cf86466badba
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c

View File

@ -0,0 +1,108 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
MAJOR_VER="$(ver_cut 1-3)"
#MAJOR_VER="18.0b1"
if [[ "${PN}" == "davinci-resolve-studio" ]] ; then
BASE_NAME="DaVinci_Resolve_Studio_${MAJOR_VER}_Linux"
CONFLICT_PKG="!!media-video/davinci-resolve"
else
BASE_NAME="DaVinci_Resolve_${MAJOR_VER}_Linux"
CONFLICT_PKG="!!media-video/davinci-resolve-studio"
fi
ARC_NAME="${BASE_NAME}.zip"
MRD_VER=1.6.2
inherit udev xdg
DESCRIPTION="Professional A/V post-production software suite"
HOMEPAGE="
https://www.blackmagicdesign.com/support/family/davinci-resolve-and-fusion
"
SRC_URI="${ARC_NAME}
https://www.danieltufvesson.com/download/?file=makeresolvedeb/makeresolvedeb_${MRD_VER}_multi.sh.tar.gz"
LICENSE="all-rights-reserved"
KEYWORDS="-* ~amd64"
SLOT="0"
IUSE="doc udev"
RESTRICT="strip mirror bindist fetch userpriv"
RDEPEND="
virtual/glu
x11-libs/gtk+:=
${CONFLICT_PKG}
"
DEPEND="
app-arch/libarchive
dev-libs/openssl-compat
dev-qt/qtcore:5
dev-qt/qtsvg:5
dev-qt/qtwebengine:5
dev-qt/qtwebsockets:5
media-libs/gstreamer
media-libs/libpng
sys-fs/fuse[suid]
udev? ( virtual/udev )
virtual/opencl
x11-misc/xdg-user-dirs
${RDEPEND}
"
BDEPEND="dev-util/patchelf"
S="${WORKDIR}"
DR="${WORKDIR}/davinci-resolve_${MAJOR_VER}-mrd${MRD_VER}_amd64"
QA_PREBUILT="*"
pkg_nofetch() {
einfo "Please download installation file"
einfo " - ${ARC_NAME}"
einfo "from ${HOMEPAGE} and place it in \$\{DISTDIR\}."
einfo "===="
einfo "Please download installation file"
einfo " - makeresolvedeb_${MRD_VER}_multi.sh.tar.gz"
einfo "from https://www.danieltufvesson.com/makeresolvedeb and place it in \$\{DISTDIR\}."
}
src_prepare() {
mv "${WORKDIR}"/makeresolvedeb*.sh "${WORKDIR}"/makeresolvedeb.sh
eapply -p0 "${FILESDIR}/makeresolvedeb_gentoo_${MRD_VER}.patch"
eapply_user
sed -i -e "s!#LIBDIR#!$(get_libdir)!" "${WORKDIR}"/makeresolvedeb.sh || die "Sed failed!"
}
_adjust_sandbox() {
addwrite /dev
addread /dev
addpredict /root
addpredict /etc
addpredict /lib
addpredict /usr
addpredict /sys
addpredict "/var/BlackmagicDesign/DaVinci Resolve"
}
src_compile() {
_adjust_sandbox
cd "${WORKDIR}"
chmod u+x ${BASE_NAME}.run
CI_TEST="1" "${WORKDIR}"/makeresolvedeb.sh ${BASE_NAME}.run
}
src_install() {
cp -a ${DR}/lib "${ED}" || die
cp -a ${DR}/opt "${ED}" || die
cp -a ${DR}/usr "${ED}" || die
cp -a ${DR}/var "${ED}" || die
if use doc ; then
dodoc *.pdf
fi
}

View File

@ -0,0 +1,70 @@
--- makeresolvedeb_1.6.2_multi.sh 2022-11-12 08:58:22.000000000 +0100
+++ makeresolvedeb.sh 2022-11-17 14:16:54.399577310 +0100
@@ -151,8 +151,8 @@
copy_object ${UNPACK_DIR}/libs/libBlackmagicRawAPI.so ${RESOLVE_BASE_DIR}/bin/
# Install panel API library
- create_directory ${DEB_DIR}/usr/lib/
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib/ libDaVinciPanelAPI.so
+ create_directory ${DEB_DIR}/usr/#LIBDIR#/
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libDaVinciPanelAPI.so
# Add postinst commands
cat >> ${DEB_DIR}/DEBIAN/postinst <<EOF
@@ -208,8 +208,8 @@
copy_object ${UNPACK_DIR}/share/default_cm_config.bin ${RESOLVE_BASE_DIR}/share/
# Extract panel API library
- create_directory ${DEB_DIR}/usr/lib
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libDaVinciPanelAPI.so
+ create_directory ${DEB_DIR}/usr/#LIBDIR#/
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libDaVinciPanelAPI.so
# BlackmagicRawAPI fixes
create_directory ${RESOLVE_BASE_DIR}/bin/BlackmagicRawAPI/
@@ -271,9 +271,9 @@
copy_object ${UNPACK_DIR}/share/default_cm_config.bin ${RESOLVE_BASE_DIR}/share/
# Extract panel API library
- create_directory ${DEB_DIR}/usr/lib
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libDaVinciPanelAPI.so
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libFairlightPanelAPI.so
+ create_directory ${DEB_DIR}/usr/#LIBDIR#/
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libDaVinciPanelAPI.so
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libFairlightPanelAPI.so
# BlackmagicRawAPI fixes for 17.0 & 17.1
if [[ "$RESOLVE_VERSION" == 17.0* ]] || [[ "$RESOLVE_VERSION" == 17.1* ]];
@@ -333,9 +333,9 @@
fi
# Extract panel API library
- create_directory ${DEB_DIR}/usr/lib
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libDaVinciPanelAPI.so
- extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/lib libFairlightPanelAPI.so
+ create_directory ${DEB_DIR}/usr/#LIBDIR#/
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libDaVinciPanelAPI.so
+ extract_tgz ${UNPACK_DIR}/share/panels/dvpanel-framework-linux-x86_64.tgz ${DEB_DIR}/usr/#LIBDIR#/ libFairlightPanelAPI.so
# Create common data dir
create_directory ${DEB_DIR}/var/BlackmagicDesign/DaVinci\ Resolve
@@ -512,7 +512,7 @@
echo "[ERROR] DaVinci Resolve installer archive is not executable"
exit 1
fi
- NUMEXTRACT=$(SKIP_PACKAGE_CHECK=1 ./${INSTALLER_ARCHIVE} -i -y -n -C ${UNPACK_DIR_ABS} | grep "^Copied " -c)
+ NUMEXTRACT=$(SKIP_PACKAGE_CHECK=1 ./${INSTALLER_ARCHIVE} -i -y -n -a -C ${UNPACK_DIR_ABS} | grep "^Copied " -c)
echo "Found ${NUMEXTRACT} objects"
if [[ -z "$(ls -A ${UNPACK_DIR})" ]];
then
@@ -621,8 +621,8 @@
# Verify that we have the commands we need
check_command tar
-check_command fakeroot
-check_command dpkg-deb
+#check_command fakeroot
+#check_command dpkg-deb
echo
# Create destination directories

4
media-video/mpv/Manifest Normal file
View File

@ -0,0 +1,4 @@
DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
EBUILD mpv-0.34.1-r102.ebuild 9743 BLAKE2B 515bb84a42b318a4c2949dd21ef7cd82bcd1fc773b10d88f25e70dd14f19e03b81b42acb5f69ed8f632b9dd61588bd6ded9ae99975f2736998af85cb59cc62d2 SHA512 988b2eacdc9a2f763cbf39fc9ef7fba1a28775ccb402e1492168237922653ef8d258aaee953061bccdca61693c97faa593767fc4c43a4e30e4881d58ef08aa4d
MISC metadata.xml 2311 BLAKE2B 311215e7a690fae3e5469bc39436aab6f8b2154d15c7848f003f2565cc0a08a8b399231512ad5c0819cc1be670be314600d2da97abda2935a5a54fa9fa8e0dca SHA512 b934750143aed87145261473e7e02e6896f11ac33ee3cb8eeda503afbfed646a6bd8668f65e672c5afbac5f812ff01ca64df32d1deaa9eba69e72cb52b6b01e7

View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
<use>
<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
<flag name="cli">Build mpv CLI player</flag>
<flag name="cplugins">Enable C plugins support</flag>
<flag name="cuda">Enable hardware video decoding via Nvidia CUDA</flag>
<flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
<flag name="egl">Enable support for various EGL-based video outputs / backends</flag>
<flag name="gamepad">Enable gamepad input support</flag>
<flag name="gbm">Enable Graphics Buffer Manager based EGL video backend</flag>
<flag name="jpeg">Enable support for saving screenshots in JPEG format</flag>
<flag name="libmpv">Build mpv shared library</flag>
<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
<flag name="opengl" restrict="&lt;media-video/mpv-0.28.0">Enable the recommended 'opengl' video output</flag>
<flag name="opengl" restrict="&gt;=media-video/mpv-0.28.0">Enable support for various OpenGL-based video backends</flag>
<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs
(Note: these outputs exist for compatibility reasons only, avoid if possible)</flag>
<flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag>
<flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
<flag name="vapoursynth">Enable vapoursynth scripting via <pkg>media-libs/vapoursynth</pkg></flag>
<flag name="vulkan">Enable support for various Vulkan-based video backends</flag>
<flag name="zimg">Enable libzimg support (for vf_fingerprint)</flag>
</use>
<upstream>
<remote-id type="github">mpv-player/mpv</remote-id>
</upstream>
</pkgmetadata>

View File

@ -0,0 +1,359 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
LUA_COMPAT=( lua5-{1..2} luajit )
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE='threads(+)'
WAF_PV=2.0.22
inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
DESCRIPTION="Media player based on MPlayer and mplayer2"
HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
if [[ ${PV} != *9999* ]]; then
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
DOCS=( RELEASE_NOTES )
else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
inherit git-r3
DOCS=(); SRC_URI=""
fi
SRC_URI+=" https://waf.io/waf-${WAF_PV}"
DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
SLOT="0"
IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
selinux test tools +uchardet vaapi vapoursynth vdpau vulkan wayland +X +xv zlib zimg"
REQUIRED_USE="
|| ( cli libmpv )
aqua? ( opengl )
egl? ( || ( gbm X wayland ) )
gamepad? ( sdl )
gbm? ( drm egl opengl )
lcms? ( opengl )
lua? ( ${LUA_REQUIRED_USE} )
nvenc? ( opengl )
opengl? ( || ( aqua egl X raspberry-pi !cli ) )
raspberry-pi? ( opengl )
test? ( opengl )
tools? ( cli )
uchardet? ( iconv )
vaapi? ( || ( gbm X wayland ) )
vdpau? ( X )
vulkan? ( || ( X wayland ) )
wayland? ( egl )
X? ( egl? ( opengl ) )
xv? ( X )
${PYTHON_REQUIRED_USE}
"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
alsa? ( >=media-libs/alsa-lib-1.0.18 )
archive? ( >=app-arch/libarchive-3.4.0:= )
bluray? ( >=media-libs/libbluray-0.3.0:= )
cdda? ( dev-libs/libcdio-paranoia
dev-libs/libcdio:= )
drm? ( x11-libs/libdrm )
dvd? (
>=media-libs/libdvdnav-4.2.0:=
>=media-libs/libdvdread-4.1.0:=
)
egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] )
gamepad? ( media-libs/libsdl2 )
iconv? (
virtual/libiconv
uchardet? ( app-i18n/uchardet )
)
jack? ( virtual/jack )
javascript? ( >=dev-lang/mujs-1.0.0 )
jpeg? ( virtual/jpeg:0 )
lcms? ( >=media-libs/lcms-2.6:2 )
>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)]
virtual/ttf-fonts
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
lua? ( ${LUA_DEPS} )
openal? ( >=media-libs/openal-1.13 )
pulseaudio? ( media-sound/pulseaudio )
raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
rubberband? ( >=media-libs/rubberband-1.8.0 )
sdl? ( media-libs/libsdl2[sound,threads,video] )
vaapi? ( media-libs/libva:=[drm(+)?,X?,wayland?] )
vapoursynth? ( media-libs/vapoursynth )
vdpau? ( x11-libs/libvdpau )
vulkan? (
>=media-libs/libplacebo-3.104.0:=[vulkan]
media-libs/shaderc
)
wayland? (
>=dev-libs/wayland-1.6.0
>=dev-libs/wayland-protocols-1.14
>=x11-libs/libxkbcommon-0.3.0
)
X? (
x11-libs/libX11
x11-libs/libXScrnSaver
x11-libs/libXext
x11-libs/libXinerama
x11-libs/libXrandr
opengl? (
x11-libs/libXdamage
virtual/opengl
)
xv? ( x11-libs/libXv )
)
zlib? ( sys-libs/zlib )
zimg? ( >=media-libs/zimg-2.9.2 )
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
dvb? ( virtual/linuxtv-dvb-headers )
nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
"
RDEPEND="${COMMON_DEPEND}
nvenc? ( x11-drivers/nvidia-drivers[X] )
selinux? ( sec-policy/selinux-mplayer )
tools? ( ${PYTHON_DEPS} )
"
BDEPEND="dev-python/docutils
virtual/pkgconfig
test? ( >=dev-util/cmocka-1.0.0 )
"
pkg_setup() {
use lua && lua-single_pkg_setup
}
src_prepare() {
cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
chmod +x "${S}"/waf || die
default
}
src_configure() {
python_setup
tc-export CC PKG_CONFIG AR
if use raspberry-pi; then
append-cflags -I"${ESYSROOT}/opt/vc/include"
append-ldflags -L"${ESYSROOT}/opt/vc/lib"
fi
local mywafargs=(
--confdir="${EPREFIX}/etc/${PN}"
$(usex cli '' '--disable-cplayer')
$(use_enable libmpv libmpv-shared)
--disable-libmpv-static
--disable-static-build
# See deep down below for build-date.
--disable-optimize # Don't add '-O2' to CFLAGS.
$(usex debug '' '--disable-debug-build')
$(use_enable doc html-build)
--disable-pdf-build
--enable-manpage-build
$(use_enable cplugins)
$(use_enable test)
$(use_enable iconv)
$(use_enable lua)
$(use_enable javascript)
$(use_enable zlib)
$(use_enable bluray libbluray)
$(use_enable dvd dvdnav)
$(use_enable cdda)
$(use_enable uchardet)
$(use_enable rubberband)
$(use_enable lcms lcms2)
$(use_enable vapoursynth)
$(use_enable archive libarchive)
--enable-libavdevice
# Audio outputs:
$(use_enable sdl sdl2) # Listed under audio, but also includes video.
$(use_enable pulseaudio pulse)
$(use_enable jack)
$(use_enable openal)
--disable-opensles
$(use_enable alsa)
$(use_enable coreaudio)
# Video outputs:
$(use_enable aqua cocoa)
$(use_enable drm)
$(use_enable gbm)
$(use_enable wayland wayland-scanner)
$(use_enable wayland wayland-protocols)
$(use_enable wayland)
$(use_enable X x11)
$(use_enable xv)
$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
$(use_enable vdpau)
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
$(use_enable libcaca caca)
$(use_enable jpeg)
$(use_enable vulkan shaderc)
$(use_enable vulkan libplacebo)
$(use_enable raspberry-pi rpi)
$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
$(usex opengl '' '--disable-gl')
$(use_enable vulkan)
$(use_enable gamepad sdl2-gamepad)
# HWaccels:
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
$(use_enable nvenc cuda-hwaccel)
$(use_enable nvenc cuda-interop)
# TV features:
$(use_enable dvb dvbin)
# Miscellaneous features:
$(use_enable zimg)
)
if use lua; then
if use lua_single_target_luajit; then
mywafargs+=( --lua="luajit" )
else
# Because it would be too simple to just let the user directly
# specify the package name to check, wouldn't it.
mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 $(lua_get_version)))" )
fi
fi
if use vaapi && use X; then
mywafargs+=(
$(use_enable egl vaapi-x-egl)
)
fi
# Not for us
mywafargs+=(
--disable-android
--disable-egl-android
--disable-uwp
--disable-audiounit
--disable-macos-media-player
--disable-wasapi
--disable-ios-gl
--disable-macos-touchbar
--disable-macos-cocoa-cb
--disable-tvos
--disable-egl-angle-win32
)
mywafargs+=(
--bashdir="$(get_bashcompdir)"
--zshdir=${EPREFIX}/usr/share/zsh/site-functions
)
# Create reproducible non-live builds.
[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
waf-utils_src_configure "${mywafargs[@]}"
}
src_install() {
waf-utils_src_install
if use lua; then
insinto /usr/share/${PN}
doins -r TOOLS/lua
fi
if use cli && use lua_single_target_luajit; then
pax-mark -m "${ED}"${EPREFIX}/usr/bin/${PN}
fi
if use tools; then
dobin TOOLS/{mpv_identify.sh,umpv}
newbin TOOLS/idet.sh mpv_idet.sh
python_replicate_script "${ED}"${EPREFIX}/usr/bin/umpv
fi
}
pkg_postinst() {
local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
for rv in ${REPLACING_VERSIONS}; do
ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
done
if [[ ${softvol_0_18_1} -eq 1 ]]; then
elog "Since version 0.18.1 the software volume control is always enabled."
elog "This means that volume controls don't change the system volume,"
elog "e.g. per-application volume with PulseAudio."
elog "If you want to restore the previous behaviour, please refer to"
elog
elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
elog
fi
if [[ ${osc_0_21_0} -eq 1 ]]; then
elog "In version 0.21.0 the default OSC layout was changed."
elog "If you want to restore the previous layout, please refer to"
elog
elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
elog
fi
if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
elog "If you want to restore the previous behaviour, please refer to"
elog
elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
elog
fi
if [[ ${opengl_0_25_0} -eq 1 ]]; then
elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
elog "the 'opengl' video output and no longer explicitly requires"
elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
fi
optfeature "URL support" net-misc/yt-dlp
xdg_icon_cache_update
xdg_desktop_database_update
}
pkg_postrm() {
xdg_icon_cache_update
xdg_desktop_database_update
}
src_test() {
cd "${S}"/build/test || die
local test
for test in *; do
if [[ -x ${test} ]]; then
./"${test}" || die "Test suite failed"
fi
done
}

View File

@ -1,7 +1,8 @@
AUX mars-nwe-syslog.patch 1929 BLAKE2B 12d00ad31fd87fb1d3d46068c42551566c7f4b5379c2930be468434b599748fdd47616095869b3dd61e3608b49e072c7bec3f6bd0c50be49bff0be4af41f6663 SHA512 ccbcd32116a310b363f08daac3ee46af9eacb5c0c4473c252ec9d8a5013cd26a70cfe813876ed1a9ec4a0ecb544bf423097476881559d75f48ea997350eaeab0
AUX mars-nwe.initd 587 BLAKE2B c5d939ae6ffcc1dbe795ffd095e285aa14a28efd7738abe39e592a45e6d0a627bd490554c01c59fd9de0e9347517b9f012861751d64576b4107f79b1bb3c03b0 SHA512 a1df3ca9ec16f698c71dd12696610fc0a4f11560f03d3c1dcc557f264458fcedc74bb509b213b3659a4ae985c47782216c8923305ce3c2e54db53163f884867a
AUX mars-nwe.service 197 BLAKE2B 28aa60c545fd4e00800df3f8b85736b2150039bab23da275f1145cb371eb68babfb3bb639607f81a8c23f3efa99929ed6d0d2a8f79b7a95ec9a2097505e9b287 SHA512 c76956fb78fa71b94f228e41406090163d4358342267e716aa90cb6d739f5267028673bef25340c7a1597bac80a7d793e8891a173880853c3c632e59402defa9
AUX mars-nwe.tmpfilesd 36 BLAKE2B 2ed4cac90b4645cc583537a5fa26b6ff22738ba093d19ed92e6b0c6ca24113a3601ef3a8d1590ccd1a547c0d823ee75ff36dc2258798febf83aeb87521b2c93c SHA512 d2deb761f0b859a317798a46c512ef431bc71c55dc903980f1a10ad19e86f6e76cc7a37b2b38122e8c362c6fd182d247caa965599025383144c0a373f67f922b
DIST mars_nwe-0.99.pl23.tar.bz2 369194 BLAKE2B 5fd2b54a4d9bf8cac13d60c1a3b0dbd54af00f506e1552a48dbc7772a52319fe688684b7dbb68a36d5e39b4363d13ec8924df357d0b9e27b42f74cb7fe94a544 SHA512 24cf78ea0091bc9414f27ac77cfa535fe611badc013f343766b88e12cc5afc2e1ae595d423ea4ec7bfb4255dd8a3f81247dcfab515044152861ea2f46380fd2d
EBUILD mars-nwe-0.99_p23.ebuild 944 BLAKE2B d7e627f78cb45005abcfc4390f59fc2a9cdd737454468db7e33250789460185e5d23c98129899961a2e88e30fe51529acea58c6e4ebe04266d9e5e6876ccb1bb SHA512 9dcb9a0127e1ae5c2cd05dc886ecc1bd6cf84a603474322cdd57e5f119f2a11bbf8336c84b46ca06a613be09179b323e7735fab3415bd9081e65a81762bf8014
EBUILD mars-nwe-0.99_p23.ebuild 976 BLAKE2B 5495ccc25e9d46831cbdf0a6679bd579582e28368777877a03a062f8b502826701901f276a98bd6babf25839e414e836d210bf7abc968abd9f9bc652b081a4bf SHA512 a0bc4c435d52b3c40cecbd9621082a9f93a55b0cc27067759386908e54d2f5dbd98107fa2ce3c1d7ff94caed2bef458b91311f1569772a5413d877fbd136a4cd
MISC ChangeLog 1018 BLAKE2B 676fd6ef267c93d1c3c5c5fad0663b9fcb288b359f1d1b8c098a953d4c270b040ecd44cbcfd3b159aa60518650e0ca9c55416a8a3671a4fb8e952cf918113047 SHA512 a11d544772c9054211d5efbdac8822966b836091a32f626d6327fe0ca587ad3f2e3b0609a79040e4a2a1f66afb62daa360789d16520e9fd6fd1b08e03366b9f1
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c

View File

@ -0,0 +1,69 @@
--- mars_nwe-0.99.pl23/src/tools.c.orig 2013-11-05 11:16:48.000000000 +0100
+++ mars_nwe-0.99.pl23/src/tools.c 2022-11-03 12:39:31.800751433 +0100
@@ -21,27 +21,6 @@
#include <stdarg.h>
#include <syslog.h>
-#if 0
-#ifndef LINUX
- extern int _sys_nerr;
- extern char *_sys_errlist[];
-#else
-# ifndef __USE_GNU
-# define _sys_nerr sys_nerr
-# define _sys_errlist sys_errlist
-# endif
-#endif
-#else
-# ifndef __USE_GNU
-# ifdef FREEBSD
-# define _sys_nerr sys_nerr
-# define _sys_errlist sys_errlist
-# else
-extern int _sys_nerr;
-extern char *_sys_errlist[];
-# endif
-# endif
-#endif
int nw_debug=0;
uint32 debug_mask=0; /* special debug masks */
@@ -182,8 +161,7 @@
if (mode & 0x10) {
int l=sprintf(pb, ", errno=%d", errnum);
pb+=l;
- if (errnum > 0 && errnum < _sys_nerr)
- l=sprintf(pb, " (%s)", _sys_errlist[errnum]);
+ l=sprintf(pb, " (%s)", strerror(errnum));
}
if (!(mode & 2)) {
char identstr[200];
@@ -208,9 +186,8 @@
va_end(ap);
}
if (mode & 0x10) {
- fprintf(logfile, ", errno=%d", errnum);
- if (errnum > 0 && errnum < _sys_nerr)
- fprintf(logfile, " (%s)", _sys_errlist[errnum]);
+ fprintf(logfile, ", errno=%d", strerror(errnum));
+ fprintf(logfile, " (%s)", strerror(errnum));
}
if (!(mode & 2))
fprintf(logfile, "\n");
@@ -236,11 +213,11 @@
errnum = -1;
mode -= 10;
}
- if (errnum >= 0 && errnum < _sys_nerr) errstr = _sys_errlist[errnum];
- else if (errnum > -1)
- sprintf(errbuf, "errno=%d", errnum);
- else
- errbuf[0] = '\0';
+// if (errnum >= 0 && errnum < _sys_nerr) errstr = _sys_errlist[errnum];
+// else if (errnum > -1)
+ sprintf(errbuf, "errno=%d", strerror(errnum));
+// else
+// errbuf[0] = '\0';
if (use_syslog) {
int prio=(mode) ? LOG_CRIT : LOG_ERR;

View File

@ -6,7 +6,7 @@ EAPI=7
MY_PV=${PV/_p/.pl}
inherit systemd cmake-utils
inherit systemd cmake
DESCRIPTION="MARtin Stovers NetWare-Emulator"
HOMEPAGE="http://www.compu-art.de/mars_nwe/"
@ -24,11 +24,15 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/mars_nwe-${MY_PV}"
PATCHES=(
"${FILESDIR}"/mars-nwe-syslog.patch
)
src_configure() {
local mycmakeargs=(
"-DCMAKE_INSTALL_SYSCONFDIR=/etc" )
cmake-utils_src_configure
cmake_src_configure
}
src_install() {
@ -36,7 +40,7 @@ src_install() {
keepdir /var/log/mars_nwe/
keepdir /var/spool/mars_nwe/
cmake-utils_src_install
cmake_src_install
newinitd "${FILESDIR}"/mars-nwe.initd mars-nwe

View File

@ -0,0 +1 @@
EBUILD ncpfs-modules-9999.ebuild 1046 BLAKE2B 06878aea0d7014477f3602cbc7165a212bbfebe880d51d09cc53f2da62e143867ff8205329d10be6ea5faedfc3f367f31834573dc619de58de579dec54df39f1 SHA512 ff60d02df4343034dc52c6042fabeefd348af1e3d741954c771a2daec4b5ab42345a69bc39d84e499f47f5dc8385cc072fa1d95cb4589e15e6e810b30b5c6daa

View File

@ -0,0 +1,55 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit git-r3 linux-info linux-mod
DESCRIPTION="ncpfs kernel module for Linux 4.18+"
HOMEPAGE="https://github.com/EnzephaloN/ncpfs-module"
EGIT_REPO_URI="https://github.com/EnzephaloN/ncpfs-module.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
BUILD_TARGETS="all"
CONFIG_CHECK="NET"
MODULE_NAMES="ncpfs(ncpfs:${S})"
src_unpack() {
if kernel_is gt 4 18 0; then
EGIT_BRANCH="kernel_4.19"
fi
if kernel_is gt 4 20 0; then
EGIT_BRANCH="kernel_4.20"
fi
if kernel_is gt 5 2 0; then
EGIT_BRANCH="kernel_5.2"
fi
if kernel_is gt 5 6 0; then
EGIT_BRANCH="kernel_5.6"
fi
if kernel_is gt 5 12 0; then
EGIT_BRANCH="kernel_5.12"
fi
if kernel_is gt 5 15 0; then
EGIT_BRANCH="kernel_5.15"
fi
if kernel_is gt 5 19 0; then
EGIT_BRANCH="master"
fi
git-r3_src_unpack
}
src_compile() {
BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
linux-mod_src_compile
}
src_install() {
linux-mod_src_install
}

View File

@ -4,6 +4,7 @@ AUX ncpfs-2.2.5-php.patch 559 BLAKE2B eb696360cf1ed7610c8349f3ed7796a81f3ce5f464
AUX ncpfs-2.2.6-align-fix.patch 421 BLAKE2B 6c701b37f0ed63014cbd0553189610c8bac9863721a764e6459bc405fe1a175bf4e388e3198d3b5511a2e08eb11691e6a7794af5971ed209ef5c1a6ef4aff468 SHA512 cf76a9866926048a0792e315c1296cb144432f8d576d9e7d68004f5eb7e10a19ff097ea4d450d2f36da05d97650f1a3411cb6a45bd88b44f6050d5b6df254528
AUX ncpfs-2.2.6-drop-kernel-check.patch 728 BLAKE2B 562d33007d23f8b2792b7d3e4f77187fab364f1107c723cbf6ae8ab8698b83f4a06d18cdeb0642afff3caa5c6ff1d0c03d40c28898fa9ffcd1498736127d0219 SHA512 6433bd1df6e9d830b0e23882dd4d00afddbd9780d994de0ca480155d817e077b88ae7f46538855631e14a62cc52ec8c1fc5c230b1b64687ada5f2cccb61e392a
AUX ncpfs-2.2.6-drop-mtab-support.patch 7196 BLAKE2B 2f932599c5dea7c071c6d29f00dd2a88bc0e961ad435b3dc3a59153e8e2643f94ccedeced389a3f73648dfe1b527c3299866a51e1ed9727941bb93a0f88a2add SHA512 a7498d8927c251f882f5d63c2250a8ef2ec72191531bd95bdd1c65aad1f8600602dd2ae54fc0ed6ca95c431fe330168abe972d3d3acad8e71733dde1452eed0b
AUX ncpfs-2.2.6-gcc10.patch 449 BLAKE2B b03c6f18f7765a1b3273c33461c299e7edf368a0a5563875fa956eefa6d18906394d3541ddc66d9c4a5ad7c6bd7c14b38709553fd03fa43608becfdf3fea7fe2 SHA512 4844610c9f516bebe37964a85810514660c7d1fcae5e6acaba8c421d61cb0e21676ed33f3a9d93f47ef974d111d455efb1a1460d5f3fc8beaa028017cadbae12
AUX ncpfs-2.2.6-gcc4.patch 1271 BLAKE2B 57b4cf96eeadd513b10ec4b6555ae4c73298304187b4bdef8e2f7d9315d1a56b225096ae25ed1a5744e5d6cc34e5dc86b84ff3adff9a91fde38e044648c259cd SHA512 b67b3a8267a76ef1fe3a128443fa96831896c3cac8f41136d3932816dfe9ab5a4d55258b6f19288c543015e53e41b691577484abf57f9163c0e3bebb4742cdbe
AUX ncpfs-2.2.6-getuid-fix.patch 5121 BLAKE2B 8996154f28afeaaf4b05e0587f38bd9bb2c10b9da6b39d5d32f777355eed186f6064ea9af0e03b590c4a2f89a4e77d9478a69404796a24ceacc1002b6068f462 SHA512 46f02242198829dc615dd9d07ec7502e88d5738b5055e480758ddabe76b65432d436b24607a0131fd33724fa1cec95b90460b8b27c887d29c5c71a410d89edd8
AUX ncpfs-2.2.6-ldflags-support.patch 5974 BLAKE2B 21fac3888dd7e2feb1322f14fcee20cd130c4d933691518ccd35d50b32d673c5799107ada5cd1e54a1646a8aaf577848173a055d8cf4990aced3ab9ed1064105 SHA512 4d9d6ed8021b9a9a64622e3b2af63616c69ba77ee8b4d83930d34071ac4a1d2f273e02a7ef7051edc5f816a860f977ba6474710e9ced91ff89560739976b10f6
@ -18,4 +19,4 @@ AUX ncpfs-2.2.6-remove-packed-attrib.patch 10312 BLAKE2B 9fe98d402ec9e4435128ff9
AUX ncpfs-2.2.6-servername-array-fix.patch 523 BLAKE2B 6cf9c27ae7bda17722a74f550beb8a2f027517db264a4f895977c05b78609cf818d88fa79e2264a99e99ea09e6de626eb209c394d286b9cae84fd4636db3de47 SHA512 10c8a0b7c6d715018acf77ea3bcca2e50add48d479cc0ee07035f3f8fb910069c2c508a25ab3de945ef19c78add6d8192f0cb484e756d9a15ceb3afcd8195a69
AUX ncpfs-2.2.6-zend_function_entry.patch 296 BLAKE2B 3bb6db87517e0fb086e95462e9b567628ede7fbeef77b5d6e101dec8a316f2a5185cad8846bbaf37dada789acfedf6f6bbc75dafa92f3eb140cfde4eb038e1eb SHA512 c96723a840cb1b0cdddb91ebe74620b87a32350be084f21b741bda4e399a7648fd00522e9f2ec8404d5a98835d3f5a343dd588f4279848cc031de5bed01680e0
DIST ncpfs-2.2.6.tar.gz 2100545 BLAKE2B b95c8c0b097227c7b9e526e978efdca2234cdd0833468be99abaa68b0feba09794be26ebcb3a1c3371bc99f6c9d007eee164fa5f918aaee3eca44aeb1420211f SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602
EBUILD ncpfs-2.2.6-r5.ebuild 2305 BLAKE2B 09dba15aa9a61f5bafff325c53ad61a7aed9bebcdbec5b848f47bbceaa6a581bc398e57fc64e498339c136fecdb53be3cdc621f75ddf74bf480e45cf97485be9 SHA512 80441e194f657b877442109de5dea2126eb82e075d68a5c0fcae9ffdc10d66b9e5f81e368d916b4187e0d67805fffb6104571a629918f7a041aa821f4b1067a1
EBUILD ncpfs-2.2.6-r5.ebuild 2432 BLAKE2B f8cf96df99c4a684fe8fb4233f3d265c9f913a2682daadaa8e319618f653badf3dd128a6f4c333f54a380c3c81bd2741a378ea0e3eb688449ce209d3cbb930ca SHA512 e6702f84655e1441d9d847a504aa4b0ef5e02e8a684f1ab3ce317de5a2f57e7c7a10271a43725bcb6b85c0040f5081e2be006c4960d3dde4d6418c7376cc89a8

View File

@ -0,0 +1,17 @@
--- ncpfs-2.2.6/sutil/ncpm_common.h.orig 2022-11-02 19:37:17.319311207 +0100
+++ ncpfs-2.2.6/sutil/ncpm_common.h 2022-11-02 19:36:12.371834652 +0100
@@ -15,10 +15,10 @@
#include "ncpmount.h"
-uid_t myuid;
-uid_t myeuid;
-char *progname;
-char mount_point[MAXPATHLEN + 1];
+extern uid_t myuid;
+extern uid_t myeuid;
+extern char *progname;
+extern char mount_point[MAXPATHLEN + 1];
static inline int suser(void) {
return myuid == 0;

View File

@ -18,7 +18,9 @@ DEPEND="
nls? ( sys-devel/gettext )
pam? ( sys-libs/pam )"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
net-fs/ncpfs-modules
net-misc/ipx-utils"
PATCHES=(
# Build fixes.
@ -55,6 +57,8 @@ PATCHES=(
# Bug 446696. This might need re-diffing if additional Makefile
# fixes are added.
"${FILESDIR}"/${P}-makefile-fix-soname-link.patch
#"${FILESDIR}"/${P}-gcc10.patch
)
DOCS=( FAQ README )
@ -62,7 +66,8 @@ DOCS=( FAQ README )
src_prepare() {
# Bug #273484.
sed -i '/ldconfig/d' lib/Makefile.in || die
append-cflags -fcommon
default
}
@ -71,7 +76,8 @@ src_configure() {
econf \
$(use_enable nls) \
$(use_enable pam pam "$(getpam_mod_dir)") \
--disable-php
--disable-php \
--disable-ipx-tools
}
src_install() {
@ -82,8 +88,8 @@ src_install() {
emake DESTDIR="${D}" install-dev
# Install a startup script in /etc/init.d and a conf file in /etc/conf.d
newconfd "${FILESDIR}"/ipx.confd ipx
newinitd "${FILESDIR}"/ipx.init ipx
#newconfd "${FILESDIR}"/ipx.confd ipx
#newinitd "${FILESDIR}"/ipx.init ipx
einstalldocs
}

View File

@ -0,0 +1 @@
EBUILD ipx-modules-9999.ebuild 551 BLAKE2B 8f2c09ecfa0aebd247bbb56b84e00030befb784970c76ef50a95d3e6ca1f4099357c05b4b57afb8993ee2480154f114aaab5961afc709a68598bcee746df7216 SHA512 5764f71403d5e220be3b49098bf08beb2bcaa419b19dbca42a528c8a85e79ead0f0f614a10a49283c10f0866b6e03ba0a2088faa165cc1e02b4bf5f053f7d0a3

View File

@ -0,0 +1,28 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit git-r3 linux-info linux-mod
DESCRIPTION="IPX kernel module for Linux 4.18+"
HOMEPAGE="https://github.com/pasis/ipx/"
EGIT_REPO_URI="https://github.com/pasis/ipx.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
BUILD_TARGETS="build"
CONFIG_CHECK="NET"
MODULE_NAMES="ipx(ipx:${S}) p8023(ipx:${S})"
src_compile() {
BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR} M=${S}"
linux-mod_src_compile
}
src_install() {
linux-mod_src_install
}

View File

@ -0,0 +1,3 @@
AUX ipx.confd 552 BLAKE2B e953dfafdec15aed36928133ca9db9bd768112f814534fa1f13ae714af955abf2f7d3ce762e9f4c6f6440f80b2e3726f9d1c435eb8804cb3760e39394deb7be3 SHA512 ba7de25e2ee3b9997d51a4eed0b8eb6ede232b627962cbc0efe6c318c1b34911cb64e4c19786e44800d8b573c8730e355e71f78aaf17391f019cc17a49c6c84d
AUX ipx.init 847 BLAKE2B 8814aa5c9bcb2cc4a19cd65c21ec92e9ef10084dffd82cbd794377c3a012ca122d3ddfa78c546565e009bfd6dba0c7e9dd3933458bb35f383501fe2fabd0964d SHA512 f8a9cb8e46988a010bf5df97b6e0e29500319ba91964a81fea515cf70e19f04889a4ad061e2aa79a1b75ba3d1ab2ab0abd89d8ebf4ed626267377bd8d05eb2db
EBUILD ipx-utils-9999.ebuild 743 BLAKE2B 2a6e8b89838581ce2ce60ef59629a77998bcb574a75e87e52a2eb978971a01572da0e871c714105204af2191197c527e4aa64295af7e801444f40cf7136a0947 SHA512 67ddbb6bc92e0acd29eb2c3a4d5ecafb7038cf866a97059aa59858fda1178ebb88a55b519cb1ae77ef04d0e4ceff5501d99a6428e967ebe7e385d9fd2f08ebff

View File

@ -0,0 +1,26 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Config file for /etc/init.d/ipx
# Automatically selecting a primary interface.
IPX_AUTO_PRIMARY=on
# Automatically creating interfaces.
IPX_AUTO_INTERFACE=on
# Interface to which IPX sockets are bound.
IPX_DEVICE=eth0
# The IPX frame type to use
IPX_FRAME=802.2
# Create a special kind of IPX interface that does not
# have a physical device or frame type.
IPX_INTERNAL_NET=no
# Network number
IPX_NETNUM=1
# Node number
IPX_NODENUM=1

View File

@ -0,0 +1,41 @@
#!/sbin/openrc-run
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
#NB: Config is in /etc/conf.d/ipx
depend() {
use net
}
start() {
local retval=0
ebegin "Bringing IPX up"
if [ ${IPX_INTERNAL_NET} = "yes" ]
then
/sbin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM}
retval=$?
else
/sbin/ipx_interface add -p ${IPX_DEVICE} \
${IPX_FRAME} ${IPX_NETNUM}
retval=$?
fi
/sbin/ipx_configure \
--auto_primary=${IPX_AUTO_PRIMARY} \
--auto_interface=${IPX_AUTO_INTERFACE}
retval=$(( $retval + $? ))
eend ${retval} "Failed to bring IPX up"
}
stop() {
local retval=0
ebegin "Bringing IPX down"
/sbin/ipx_configure --auto_primary=off --auto_interface=off
retval=$?
/sbin/ipx_interface delall
retval=$(( $retval + $? ))
eend ${retval} "Failed to down IPX"
}

View File

@ -0,0 +1,36 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EGIT_REPO_URI="https://github.com/pasis/ipx-utils.git"
inherit autotools git-r3
DESCRIPTION="The IPX Utilities"
HOMEPAGE="https://github.com/pasis/ipx-utils"
LICENSE="ipx-utils GPL-2" # GPL-2 only for init script
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="net-misc/ipx-modules"
src_prepare() {
default
eautoreconf
}
src_configure() {
econf --bindir="${EPREFIX}"/sbin
}
src_install() {
newconfd "${FILESDIR}"/ipx.confd ipx
newinitd "${FILESDIR}"/ipx.init ipx
default
}
pkg_postinst() {
elog "IPX support was removed in Linux 4.18. For newer kernels build the ipx module from sources: https://github.com/pasis/ipx"
}

View File

@ -1,4 +0,0 @@
DIST RemoteDesktopManager.Free_2022.2.2.5_amd64.deb 124867396 BLAKE2B 699e406135b3c4edb60f1ecdc9fbdf2f20c1e36610ef749e5d42ca16f2156fd7547353425ad2bda4b8f138c41e7ccbf2bef4d69866d8fe5b75c06ace038f4922 SHA512 c13779e425a3d161f5d3537e8367c9759050090585a0c12e690517b5ab458f5b67520a9baf1e6c1deb0302f1d90a299a6282d660ffa20b36a6aaf86961b60e31
EBUILD remotedesktopmanager-free-2022.2.2.5.ebuild 1194 BLAKE2B cf63e60ad3c6a4696e91fb28959263212bef13307edcd61fad87d088f7c666ce646cc647346bb70f46989f0088a274df290495912b7e7a60fd616a182c51b52d SHA512 f4641a579213ec80a4aa93477c5e3bed19fc425828c491edbbd16ee2543405d66463a58aff1802174f4df2a708215450b8ff0356da3f16f592d56009462ca86b
MISC ChangeLog 889 BLAKE2B 216bbbfe9b264ef06f5b56748af1ea7366fa49f2406604264b7d22ce8f464ffd7491a57912d7cf1be7d3dc030578960acca895236d6e06fd017f02a9138f0b7f SHA512 09aa97933a9709827b6e3c01ce8a3829cb3d494f7fdac570faa30da6fac440c752391d8dcaf7d03c5cd1163686e8921c1bf4ad75827e4b8df05bbcde03548488
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c

View File

@ -0,0 +1,4 @@
DIST RemoteDesktopManager_2022.3.0.5_amd64.deb 133943000 BLAKE2B 3bc38215901380ff7197f61c461412a743b970d70642b3ec6144f7392efee116f6aa12b028e8086266fb988370bdd39eac6b0f40b876ceb827a7754f051175ee SHA512 c488a982ce4435f002064e5803c91ed85003f118f04baeb960b0c56cc9a37d8843eb12109f5fc1268f17aa4bc895d29fc63da609edf14dc7cd2edba93e086819
EBUILD remotedesktopmanager-2022.3.0.5.ebuild 1255 BLAKE2B c60bd29885c0d26c43315aa54fe00f721c86364ed3f8e061dd9a3fe040680c6b3f252262ea209cb2e32221e630e74bc910e4308a1eaaa6c82e17d0bb3d45024b SHA512 4ca7cdfdfcea791a890b182f1e1460e20b6cc5c76a5cf165b43df675d77722123aa03c9ff7b544665f7cb98478c307077a114cdab6ed3e8f09a754231fa2eb58
MISC ChangeLog 889 BLAKE2B 216bbbfe9b264ef06f5b56748af1ea7366fa49f2406604264b7d22ce8f464ffd7491a57912d7cf1be7d3dc030578960acca895236d6e06fd017f02a9138f0b7f SHA512 09aa97933a9709827b6e3c01ce8a3829cb3d494f7fdac570faa30da6fac440c752391d8dcaf7d03c5cd1163686e8921c1bf4ad75827e4b8df05bbcde03548488
MISC metadata.xml 408 BLAKE2B 66a3e2838d5c5f95c7463733cd13b1230ef3ca005ec0c5dac797561be30f950da98dfa41eeb4d43cf97500c9a2e0d04c57b0b084d60107072a988dd7c4d16ded SHA512 9cac3e4a07c425e87274de776e03d243e462341168235cd3991ef4706aa1a902cf6591ae8e965b9c4ed370fc2ebef3ca805a9c761d05c4b994ae8667198b267c

View File

@ -8,7 +8,8 @@ inherit eutils unpacker pam
DESCRIPTION="Remote DesktopManager"
HOMEPAGE="https://remotedesktopmanager.com"
SRC_URI="https://cdn.devolutions.net/download/Linux/RDM/${PV}/RemoteDesktopManager.Free_${PV}_amd64.deb"
#SRC_URI="https://cdn.devolutions.net/download/Linux/RDM/${PV}/RemoteDesktopManager.Free_${PV}_amd64.deb"
SRC_URI="https://cdn.devolutions.net/download/Linux/RDM/${PV}/RemoteDesktopManager_${PV}_amd64.deb"
LICENSE="Devolution"
@ -35,13 +36,13 @@ src_unpack() {
}
src_install() {
dodir /opt/devolutions/RemoteDesktopManager.Free
cp -aR usr/lib/devolutions/RemoteDesktopManager.Free/* "${D}/opt/devolutions/RemoteDesktopManager.Free"
dodir /opt/devolutions/RemoteDesktopManager
cp -aR usr/lib/devolutions/RemoteDesktopManager/* "${D}/opt/devolutions/RemoteDesktopManager"
dodir /opt/bin
sed -e 's!usr/lib!opt!g' bin/remotedesktopmanager.free > "${D}/opt/bin/remotedesktopmanager.free"
chmod +x "${D}/opt/bin/remotedesktopmanager.free"
sed -e 's!usr/lib!opt!g' bin/remotedesktopmanager > "${D}/opt/bin/remotedesktopmanager"
chmod +x "${D}/opt/bin/remotedesktopmanager"
dodir /usr/share/applications
sed -e "s!usr/lib!opt!g" usr/share/applications/remotedesktopmanager.free.desktop > "${D}/usr/share/applications/remotedesktopmanager.free.desktop"
sed -e "s!usr/lib!opt!g" usr/share/applications/remotedesktopmanager.desktop > "${D}/usr/share/applications/remotedesktopmanager.desktop"
dodir /usr/share/icons
cp -aR usr/share/icons/* "${D}/usr/share/icons"
}

View File

@ -1,3 +1,3 @@
EBUILD openvpn3-18_beta.ebuild 1312 BLAKE2B e28df55cc6859c3990816e581334068347b93e3836978a772a703d795ca40d00c4f2a59b4939ce21602e3a948375fb252cdbd8318e04eaf1031d89d2a7eba8f4 SHA512 403e7bad61a361e8332c6f288291c312c623ecfc22b4628958ff1aeb57020e892932af8bcb5b65c8bb751ad88c06af2f3c165b816a7a3620a6439712ec5f6c3c
EBUILD openvpn3-19_beta.ebuild 1312 BLAKE2B c75b3d76a7b105f478b0c241029c770510a3f3639cde9120cc2fcc80fa13cb7d902427477b3d0130c35a787eaa61604044b5f9a98eea0f8adad6dd08ffd359e8 SHA512 052383dd52c2134fb67ebe98b82e2348fbbe0f99dcad1935c96b0459988312fb983eab93cfda8d4b53eb387c8f8027e49b977446a39184fd569ee8779ea71a8d
MISC ChangeLog 243 BLAKE2B 092ef53c181589e2ddb9583b4b3aa3108e60b200f8c12f26c1938453c7562c0faea3e83f085a77a7e8fefe826b051ea1ae5f593bec1d4d635287bdb8bbeec438 SHA512 07c1a772cf251a5d733d6dc0058e608724aba5462563ad60e36b23db256fde46f76e07cf29c3ba1fbfa9821b8654ad7fa504cf5533cec439f9603b6d7d8b9757
MISC metadata.xml 411 BLAKE2B 6bd76e3591b8a2d88277f9ebfbd5951a7458a266adf5818533a1d829a770db62e1de41a4cb4f29206ed5eb381c6f4bfdc04973c4c65bd72496b7e31b6c85880f SHA512 df1f54923628bff824dc8835c96902bd07d4462472b9b8f356abb0b9b81875d78fa96e511290739ecc5423eadc8b2579a65b2f31f9c2c6a73c8d3413c0603d98

View File

@ -10,7 +10,7 @@ HOMEPAGE="https://openvpn.net"
LICENSE="GNU Affero General Public License v3.0"
EGIT_REPO_URI="https://github.com/OpenVPN/openvpn3-linux.git"
EGIT_COMMIT="v18_beta"
EGIT_COMMIT="v19_beta"
EGIT_SUBMODULES=( '*' )
SLOT="0"

View File

@ -1,4 +1,4 @@
DIST Logic-2.3.55-master.AppImage 168567824 BLAKE2B 5eef4973056556bd606da512545bafff5cc57ea51e488a81cedb1139ff02d9f6e9d29aa4a3ea46dc6de7c24007059056b312990776eaf32a41b0dcce20720440 SHA512 45bdb252818242fdae55daa51034a0c6b96d9539dbf3399c53cb389aff1013da6dbfc71d9130b1fc5f2bb10592107c0cb9c911039772a487f69049e33c4cc2ca
EBUILD saleae-logic-bin-2.3.55.ebuild 2928 BLAKE2B 581ffd4d742562cf2b309fcb24abe089026ae7b83f509e14cf1ae0a300184fde5c068149ecbd47552a2bb4d44f99c5a44cc15756b718700e19e3ff71e8e53e1d SHA512 7e55b0c391181bbc7c677890a64581493d2546af33a96254f72c00ad4bdc0b6eb34dc0794e37582f6a6604bdb335778890142e276b76a55a49f9ae1ed0c2f1d5
EBUILD saleae-logic-bin-2.3.55.ebuild 2915 BLAKE2B 7bf8189b5da14e4217f24342ff1fc4503b2b2070532dc798ffb22c658daccc365a14df96db1683220674baea9435c5a602a8225ea90459925e2befd19e24a768 SHA512 935889def41314dc684deb9e37344dbd438242566c4d2f06274cc9deb0cc7fa8b7daeb30be32fd8d2e4a9b1f8905c5844cf2270222151f5e04c08ac74724b9e9
MISC ChangeLog 405 BLAKE2B 5fd50b228496d7ca318aed901b5dfc3ce33fc7327331495a1f94417087fcb9b6260e4f6ddde90e510507968208e2e16ca076b27005555679ff26272505a668f4 SHA512 0a832dcab3105dbfc8856c8a8e2eae4bf85ac2aa97d06c19b2591b4acde7fa5e7690e1ff1dc01799a19dad0f80bb0aec58925f5e3192331101af2fcb93e126bd
MISC metadata.xml 411 BLAKE2B 6bd76e3591b8a2d88277f9ebfbd5951a7458a266adf5818533a1d829a770db62e1de41a4cb4f29206ed5eb381c6f4bfdc04973c4c65bd72496b7e31b6c85880f SHA512 df1f54923628bff824dc8835c96902bd07d4462472b9b8f356abb0b9b81875d78fa96e511290739ecc5423eadc8b2579a65b2f31f9c2c6a73c8d3413c0603d98

View File

@ -75,7 +75,7 @@ src_install() {
find ${P} -type f -exec chmod 644 {} \;
find ${P} -type f -name "*.so*" -print0 |xargs -0 chmod +x
find ${P}/resources/linux/pythonlibs/bin -type f -print0 |xargs -0 chmod +x
find ${P}/resources/app.asar.unpacked/node_modules/@saleae/graph-interface/bin/linux-x64-76 -type f -print0 |xargs -0 chmod +x
find ${P}/resources/app.asar.unpacked/node_modules/@saleae/graph-interface/bin -type f -print0 |xargs -0 chmod +x
chmod +x ${P}/Logic
cp -a ${P}/* "${ED}"/opt/Saleae/Logic || die "Failed to move directory"

View File

@ -1,2 +1,2 @@
DIST balena-etcher-electron_1.7.9_amd64.deb 86767140 BLAKE2B 28408a987fc856217de5b9d41c235f97d25a76d08421870e31e84cf6c30c4dabe32c9e1aa0048fa11a74c55bd6fa69f3996662d959f44e8be8853d101c8684c4 SHA512 b7346d28bd1d989ba1c262febdc57f2f323a7c8eaf61e96ef9fff6b33c8ed2310b26deef0d599837aa5f6e6837b699b37f9c64dadb1bb119d1573abd7bd44625
EBUILD etcher-1.7.9.ebuild 998 BLAKE2B a0e280c510dd2c8b322401f71d1804f80cf1e53e4a9458833113152b109e83c5833288340c63f06470ecad5f2df22038d65e9e56735d001f4f46c1845887d51d SHA512 9371c1e0302dc51c6a5965ecd23e7ac915fa253c1f241e0f075423e0f984ece269b0367c21abc44c7142f6ecfd5835ecb609e10ed08de6c3cb69094b8db1b9d7
EBUILD etcher-1.7.9.ebuild 1155 BLAKE2B eaf3c9a99a13e2a45907a8d4328d2f2f2164192687871f54c7383958dac3ab11f1cfc6c666a75b904baa190113d8b792afb3ce812238ea02c614ef61ee5f9753 SHA512 4c66453598ee209570e4ae0a0b6f0e0dc996baa46a38205a41abf129df29ad1bc003cff2902597fc7cc02d4be865a6637af296d80561a286b7e77f3cc261f8c5

View File

@ -34,8 +34,9 @@ src_unpack() {
src_install() {
mv * "${D}" || die
sed -i "s/Utility/System/g" "${D}"usr/share/applications/balena-"${PN}"-electron.desktop
sed -i "s/Icon\=balena\-etcher\-electron/Icon\=etcher\-electron/g" "${D}"usr/share/applications/balena-"${PN}"-electron.desktop
sed -i "s/Utility/System/g" "${D}"usr/share/applications/balena-"${PN}"-electron.desktop
sed -i "s/Icon\=balena\-etcher\-electron/Icon\=etcher\-electron/g" "${D}"usr/share/applications/balena-"${PN}"-electron.desktop
sed -i "s/\/balena\-etcher\-electron/\/balena\-etcher\-electron \-\-disable\-gpu\-sandbox/g" "${D}"usr/share/applications/balena-"${PN}"-electron.desktop
rm -rf "${D}"usr/share/doc
fperms 0755 /opt/balenaEtcher/balena-"${PN}"-electron || die
}

View File

@ -0,0 +1,198 @@
# ChangeLog for sys-kernel/win4lin-sources
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.37 2004/10/21 18:33:36 plasmaroo Exp $
*win4lin-sources-2.6.7-r6 (21 Oct 2004)
21 Oct 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.6.7-r5.ebuild,
+win4lin-sources-2.6.7-r6.ebuild,
+files/win4lin-sources-2.6.CAN-2004-0816.patch:
Version bumped to address CAN-2004-0816; bug #68375.
26 Aug 2004; <plasmaroo@gentoo.org> win4lin-sources-2.6.7-r5.ebuild:
Marking the 2.6 version as "~x86"; bug #55587.
23 Aug 2004; Michal Januszewski <spock@gentoo.org>
win4lin-sources-2.6.7-r5.ebuild:
Updated the ebuild to make use of the explicit patch levels kernel-2 eclass
feature.
*win4lin-sources-2.4.26-r6 (10 Aug 2004)
10 Aug 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.4.26-r5.ebuild,
+win4lin-sources-2.4.26-r6.ebuild, -win4lin-sources-2.6.7-r4.ebuild,
+win4lin-sources-2.6.7-r5.ebuild,
+files/win4lin-sources-2.4.26.cmdlineLeak.patch,
+files/win4lin-sources-2.6.cmdlineLeak.patch:
Version bump for the /proc/cmdline leak vulnerability; bug #59905.
*win4lin-sources-2.4.26-r5 (08 Aug 2004)
08 Aug 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.4.26-r4.ebuild,
+win4lin-sources-2.4.26-r5.ebuild,
+files/win4lin-sources-2.4.26.CAN-2004-0685.patch:
Version bump for CAN-2004-0685, bug #59769.
05 Aug 2004; <plasmaroo@gentoo.org> win4lin-sources-2.6.7-r4.ebuild:
Added a fix for bug #58008 to the 2.6 ebuild.
*win4lin-sources-2.6.7-r4 (05 Aug 2004)
05 Aug 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.4.26-r3.ebuild,
+win4lin-sources-2.4.26-r4.ebuild, -win4lin-sources-2.6.7-r3.ebuild,
+win4lin-sources-2.6.7-r4.ebuild:
Added a patch for the CAN-2004-0415 vulnerability, bug #59378.
*win4lin-sources-2.6.7-r3 (21 Jul 2004)
21 Jul 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.6.7-r2.ebuild,
+win4lin-sources-2.6.7-r3.ebuild,
+files/win4lin-sources-2.6.CAN-2004-0596.patch:
Version bump for the CAN-2004-0596 issue; bug #57826.
*win4lin-sources-2.4.26-r3 (09 Jul 2004)
*win4lin-sources-2.6.7-r2 (09 Jul 2004)
09 Jul 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.4.26-r2.ebuild,
+win4lin-sources-2.4.26-r3.ebuild, -win4lin-sources-2.6.7-r1.ebuild,
+win4lin-sources-2.6.7-r2.ebuild,
+files/win4lin-sources-2.6.ProcPerms.patch,
+files/win4lin-sources.CAN-2004-0497.patch:
Version bumps for kernel attribute vulnerabilities, bug #56479.
*win4lin-sources-2.6.6-r2 (30 Jun 2004)
30 Jun 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.6.6-r1.ebuild,
+win4lin-sources-2.6.6-r2.ebuild,
+files/win4lin-sources-2.6.IPTables-RDoS.patch:
Version bump for the 2.6 IPTables RDoS vulnerability; bug #55694.
*win4lin-sources-2.4.26-r2 (29 Jun 2004)
29 Jun 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.4.26-r1.ebuild,
+win4lin-sources-2.4.26-r2.ebuild,
+files/win4lin-sources-2.4.26.CAN-2004-0495.patch,
+files/win4lin-sources-2.4.26.CAN-2004-0535.patch:
Security bump for the CAN-2004-0495 and CAN-2004-0535 vulnerabilities.
*win4lin-sources-2.4.26-r1 (15 Jun 2004)
15 Jun 2004; <plasmaroo@gentoo.org> +win4lin-sources-2.4.26-r1.ebuild,
-win4lin-sources-2.4.26.ebuild, +win4lin-sources-2.6.6-r1.ebuild,
-win4lin-sources-2.6.6.ebuild,
+files/win4lin-sources-2.4.26.FPULockup-53804.patch,
+files/win4lin-sources-2.6.6.FPULockup-53804.patch:
Added patches for the FPU-lockup issues; please see bug #58304 for details.
*win4lin-sources-2.4.26 (01 Jun 2004)
01 Jun 2004; <plasmaroo@gentoo.org> +win4lin-sources-2.4.26.ebuild,
+win4lin-sources-2.6.6.ebuild:
Version bumps; closes bugs #47881, #48200, and #49976. Old versions
removed.
31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
win4lin-sources-2.4.25-r2.ebuild, win4lin-sources-2.6.5-r1.ebuild:
Masked win4lin-sources-2.6.5-r1.ebuild broken for ppc.
31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
win4lin-sources-2.4.25-r2.ebuild:
Masked win4lin-sources-2.4.25-r2.ebuild broken for ppc.
27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
win4lin-sources-2.4.25-r2.ebuild:
Add inherit eutils.
*win4lin-sources-2.4.25-r2 (17 Apr 2004)
17 Apr 2004; <plasmaroo@gentoo.org>
+files/win4lin-sources-2.4.25.CAN-2004-0177.patch,
+files/win4lin-sources-2.4.25.CAN-2004-0178.patch,
-win4lin-sources-2.4.25-r1.ebuild, +win4lin-sources-2.4.25-r2.ebuild:
Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities.
17 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
win4lin-sources-2.6.5-r1.ebuild:
Fixed patch name (bug #48029).
*win4lin-sources-2.6.5-r1 (15 Apr 2004)
15 Apr 2004; <plasmaroo@gentoo.org> win4lin-sources-2.4.25-r1.ebuild,
win4lin-sources-2.6.5-r1.ebuild:
Version bump for the CAN-2004-0109 issue; bug #47881. Old versions
removed.
12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
win4lin-sources-2.4.23-r2.ebuild, win4lin-sources-2.6.2-r1.ebuild:
Add eutils to inherit, add IUSE=
*win4lin-sources-2.4.25 (24 Mar 2004)
24 Mar 2004; <plasmaroo@gentoo.org> win4lin-sources-2.4.25.ebuild:
Version bump. Closes bug #45541.
*win4lin-sources-2.4.23-r2 (18 Feb 2004)
*win4lin-sources-2.6.2-r1 (18 Feb 2004)
18 Feb 2004; <plasmaroo@gentoo.org> win4lin-sources-2.4.22-r1.ebuild,
win4lin-sources-2.4.23-r1.ebuild, win4lin-sources-2.4.23-r2.ebuild,
win4lin-sources-2.6.0-r1.ebuild, win4lin-sources-2.6.2-r1.ebuild,
files/win4lin-sources-2.4.munmap.patch,
files/win4lin-sources-2.6.munmap.patch:
Added the patch for the mremap/munmap vulnerability. Bug #42024.
Removed vulnerable versions.
*win4lin-sources-2.6.0-r1 (06 Jan 2004)
06 Jan 2004; <plasmaroo@gentoo.org> win4lin-sources-2.4.20-r1.ebuild,
win4lin-sources-2.4.22-r1.ebuild, win4lin-sources-2.4.22.ebuild,
win4lin-sources-2.4.23-r1.ebuild, win4lin-sources-2.4.23.ebuild,
win4lin-sources-2.6.0-r1.ebuild, win4lin-sources-2.6.0.ebuild,
files/win4lin-sources-2.4.CAN-2003-0985.patch,
files/win4lin-sources-2.4.rtc_fix.patch,
files/win4lin-sources-2.6.CAN-2003-0985.patch:
Added patches to address the security vulnerabilities in bugs #37292 and
#37317. Removed old unpatched releases and the 2.4.20-r1 release.
*win4lin-sources-2.6.0 (30 Dec 2003)
30 Dec 2003; <plasmaroo@gentoo.org> win4lin-sources-2.6.0.ebuild:
Version bump; closes bug #36747.
*win4lin-sources-2.4.23 (04 Dec 2003)
04 Dec 2003; <plasmaroo@gentoo.org> win4lin-sources-2.4.23.ebuild:
Version bump; this resolves bug ID #35087.
01 Dec 2003; Brian Jackson <iggy@gentoo.org>
win4lin-sources-2.4.20-r1.ebuild, win4lin-sources-2.4.22.ebuild,
files/do_brk_fix.patch: Fix the 'do_brk' vulnerability.
20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
win4lin-sources-2.4.20-r1.ebuild, win4lin-sources-2.4.22.ebuild:
Move version handling logic to after inherit kernel, or insert it where
necessary.
*win4lin-sources-2.4.22 (28 Oct 2003)
28 Oct 2003; <plasmaroo@gentoo.org> win4lin-sources-2.4.22.ebuild:
Version bump. Bug #32088.
29 Sep 2003; Martin Holzer <mholzer@gentoo.org>
win4lin-sources-2.4.20-r1.ebuild:
Now uses mirror://kernel.
17 Dec 2002; Brandon Low <lostlogic@gentoo.org>:
Make all kernel-sources SLOT="${KV}"
*win4lin-sources-2.4.20-r1 (12 Dec 2002)
14 Dec 2002; John Lennard <yakmoose@gentoo.org>; win4lin-sources-2.4.20-r2.ebuild :
Fixed the mki-adapter patch line in the ebuild as the mki-adapter module
was not being patched into the source tree...
*win4lin-sources-2.4.20-r1 (12 Dec 2002)
12 Dec 2002; Brandon Low <lostlogic@gentoo.org>; win4lin-sources-2.4.20-r1.ebuild :
The first release of the win4lin-sources in Gentoo. This kernel should
allow licensed or trial users of Win4Lin to run their systems :)

View File

@ -0,0 +1,19 @@
MD5 8deefecf39c704e907c2c42f810b7b4b ChangeLog 7780
MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
MD5 014ba03b3e63507d68b4ea6c5ad65296 win4lin-sources-2.6.7-r6.ebuild 1575
MD5 1bcdac5843dca353edd3fdd3ab7d787f win4lin-sources-2.4.26-r6.ebuild 2051
MD5 6d3c92f001f307906b42c86de91d8fd0 files/digest-win4lin-sources-2.6.7-r6 283
MD5 8204afea1d572b49a4a80d8da4eef0c9 files/win4lin-sources-2.6.CAN-2004-0596.patch 1033
MD5 c2510fe1891f5a9effb12c2196922206 files/win4lin-sources-2.6.cmdlineLeak.patch 281
MD5 c9da1bc82b906f6abc648c056e7bf662 files/win4lin-sources-2.4.26.FPULockup-53804.patch 354
MD5 d1ccc2047be533c992f67270a150a210 files/win4lin-sources-2.4.26.cmdlineLeak.patch 388
MD5 aa595005721b58929ee55e2e8f4b6ba0 files/win4lin-sources-2.6.CAN-2004-0816.patch 1693
MD5 dc18e982f8149588a291956481885a8c files/win4lin-sources-2.4.26.CAN-2004-0495.patch 17549
MD5 60d25ff310fc6abfdce39ec9e47345af files/win4lin-sources-2.4.26.CAN-2004-0685.patch 2809
MD5 39361f8d16b1fe5891aab62e92f8cd30 files/win4lin-sources-2.6.IPTables-RDoS.patch 390
MD5 57a8c410c25a71c974158ab331b65640 files/digest-win4lin-sources-2.4.26-r6 277
MD5 d4a740ae56c2049247083af387a22a85 files/win4lin-sources-2.4.26.CAN-2004-0394.patch 350
MD5 02c062ec3a11a6a1498cdf0b1716c90a files/win4lin-sources-2.6.6.FPULockup-53804.patch 895
MD5 0f66013f643c79c97fda489618a4e2fd files/win4lin-sources-2.4.26.CAN-2004-0535.patch 476
MD5 95708646470a95668e8789cd415844ed files/win4lin-sources.CAN-2004-0497.patch 846
MD5 b738cb0120a32aa92cfcfdbd564dd21f files/win4lin-sources-2.6.ProcPerms.patch 1368

View File

@ -0,0 +1,4 @@
MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
MD5 32e4cda45fa0f090dffa157bc4504a4e mki-adapter.patch 181483
MD5 e9bc95992e489a3f54aabef100e13fcf Kernel-Win4Lin3-2.4.26.patch 23600
MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145

View File

@ -0,0 +1,4 @@
MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
MD5 45347c8bd1a1c791e9a12d1e09162f33 mki-adapter26_1_3_6.patch 127032
MD5 e5b7ca075f0281509442913cbd09ca26 Kernel-Win4Lin3-2.6.7.patch 26620
MD5 52996b643afbd6ed9ba38b9483c2cac3 linux-2.6.7-CAN-2004-0415.patch 112612

View File

@ -0,0 +1,11 @@
--- linux-2.4.22-oM3-orig/kernel/panic.c Tue Mar 30 15:37:18 2004
+++ linux-2.4.22-oM3-mod/kernel/panic.c Mon May 17 18:44:01 2004
@@ -51,7 +51,7 @@
bust_spinlocks(1);
va_start(args, fmt);
- vsprintf(buf, fmt, args);
+ vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
printk(KERN_EMERG "Kernel panic: %s\n",buf);
if (in_interrupt())

View File

@ -0,0 +1,655 @@
--- linux/net/decnet/dn_dev.c.bak Wed Jun 16 14:42:24 2004
+++ linux/net/decnet/dn_dev.c Wed Jun 16 14:42:34 2004
@@ -1070,31 +1070,39 @@ int dnet_gifconf(struct net_device *dev,
{
struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
struct dn_ifaddr *ifa;
- struct ifreq *ifr = (struct ifreq *)buf;
+ char buffer[DN_IFREQ_SIZE];
+ struct ifreq *ifr = (struct ifreq *)buffer;
+ struct sockaddr_dn *addr = (struct sockaddr_dn *)&ifr->ifr_addr;
int done = 0;
if ((dn_db == NULL) || ((ifa = dn_db->ifa_list) == NULL))
return 0;
for(; ifa; ifa = ifa->ifa_next) {
- if (!ifr) {
+ if (!buf) {
done += sizeof(DN_IFREQ_SIZE);
continue;
}
if (len < DN_IFREQ_SIZE)
return done;
- memset(ifr, 0, DN_IFREQ_SIZE);
+ memset(buffer, 0, DN_IFREQ_SIZE);
if (ifa->ifa_label)
strcpy(ifr->ifr_name, ifa->ifa_label);
else
strcpy(ifr->ifr_name, dev->name);
- (*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_family = AF_DECnet;
- (*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_len = 2;
- (*(dn_address *)(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_addr) = ifa->ifa_local;
+ addr->sdn_family = AF_DECnet;
+ addr->sdn_add.a_len = 2;
+ memcpy(addr->sdn_add.a_addr, &ifa->ifa_local,
+ sizeof(dn_address));
- ifr = (struct ifreq *)((char *)ifr + DN_IFREQ_SIZE);
+ if (copy_to_user(buf, buffer, DN_IFREQ_SIZE)) {
+ done = -EFAULT;
+ break;
+ }
+
+ buf += DN_IFREQ_SIZE;
len -= DN_IFREQ_SIZE;
done += DN_IFREQ_SIZE;
}
--- linux-2.4.21/drivers/net/wireless/airo.c 2003-06-13 15:51:35.000000000 +0100
+++ linux-2.4.21/drivers/net/wireless/airo.c.plasmaroo 2004-06-24 11:09:08.260352168 +0100
@@ -3012,19 +3012,22 @@
size_t len,
loff_t *offset )
{
- int i;
- int pos;
+ loff_t pos = *offset;
struct proc_data *priv = (struct proc_data*)file->private_data;
- if( !priv->rbuffer ) return -EINVAL;
+ if (!priv->rbuffer)
+ return -EINVAL;
- pos = *offset;
- for( i = 0; i+pos < priv->readlen && i < len; i++ ) {
- if (put_user( priv->rbuffer[i+pos], buffer+i ))
- return -EFAULT;
- }
- *offset += i;
- return i;
+ if (pos < 0)
+ return -EINVAL;
+ if (pos >= priv->readlen)
+ return 0;
+ if (len > priv->readlen - pos)
+ len = priv->readlen - pos;
+ if (copy_to_user(buffer, priv->rbuffer + pos, len))
+ return -EFAULT;
+ *offset = pos + len;
+ return len;
}
/*
@@ -3036,24 +3039,24 @@
size_t len,
loff_t *offset )
{
- int i;
- int pos;
+ loff_t pos = *offset;
struct proc_data *priv = (struct proc_data*)file->private_data;
- if ( !priv->wbuffer ) {
+ if (!priv->wbuffer)
return -EINVAL;
- }
-
- pos = *offset;
- for( i = 0; i + pos < priv->maxwritelen &&
- i < len; i++ ) {
- if (get_user( priv->wbuffer[i+pos], buffer + i ))
- return -EFAULT;
- }
- if ( i+pos > priv->writelen ) priv->writelen = i+file->f_pos;
- *offset += i;
- return i;
+ if (pos < 0)
+ return -EINVAL;
+ if (pos >= priv->maxwritelen)
+ return 0;
+ if (len > priv->maxwritelen - pos)
+ len = priv->maxwritelen - pos;
+ if (copy_from_user(priv->wbuffer + pos, buffer, len))
+ return -EFAULT;
+ if (pos + len > priv->writelen)
+ priv->writelen = pos + len;
+ *offset = pos + len;
+ return len;
}
static int proc_status_open( struct inode *inode, struct file *file ) {
--- linux/drivers/sound/mpu401.c.bak Wed Jun 16 14:42:24 2004
+++ linux/drivers/sound/mpu401.c Wed Jun 16 14:42:34 2004
@@ -1493,14 +1493,16 @@ static unsigned long mpu_timer_get_time(
static int mpu_timer_ioctl(int dev, unsigned int command, caddr_t arg)
{
int midi_dev = sound_timer_devs[dev]->devlink;
+ int *p = (int *)arg;
switch (command)
{
case SNDCTL_TMR_SOURCE:
{
int parm;
-
- parm = *(int *) arg;
+
+ if (get_user(parm, p))
+ return -EFAULT;
parm &= timer_caps;
if (parm != 0)
@@ -1512,7 +1514,9 @@ static int mpu_timer_ioctl(int dev, unsi
else if (timer_mode & TMR_MODE_SMPTE)
mpu_cmd(midi_dev, 0x3d, 0); /* Use SMPTE sync */
}
- return (*(int *) arg = timer_mode);
+ if (put_user(timer_mode, p))
+ return -EFAULT;
+ return timer_mode;
}
break;
@@ -1537,10 +1541,13 @@ static int mpu_timer_ioctl(int dev, unsi
{
int val;
- val = *(int *) arg;
+ if (get_user(val, p))
+ return -EFAULT;
if (val)
set_timebase(midi_dev, val);
- return (*(int *) arg = curr_timebase);
+ if (put_user(curr_timebase, p))
+ return -EFAULT;
+ return curr_timebase;
}
break;
@@ -1549,7 +1556,8 @@ static int mpu_timer_ioctl(int dev, unsi
int val;
int ret;
- val = *(int *) arg;
+ if (get_user(val, p))
+ return -EFAULT;
if (val)
{
@@ -1564,7 +1572,9 @@ static int mpu_timer_ioctl(int dev, unsi
}
curr_tempo = val;
}
- return (*(int *) arg = curr_tempo);
+ if (put_user(curr_tempo, p))
+ return -EFAULT;
+ return curr_tempo;
}
break;
@@ -1572,18 +1582,25 @@ static int mpu_timer_ioctl(int dev, unsi
{
int val;
- val = *(int *) arg;
+ if (get_user(val, p))
+ return -EFAULT;
if (val != 0) /* Can't change */
return -EINVAL;
- return (*(int *) arg = ((curr_tempo * curr_timebase) + 30) / 60);
+ val = (curr_tempo * curr_timebase + 30) / 60;
+ if (put_user(val, p))
+ return -EFAULT;
+ return val;
}
break;
case SNDCTL_SEQ_GETTIME:
- return (*(int *) arg = curr_ticks);
+ if (put_user(curr_ticks, p))
+ return -EFAULT;
+ return curr_ticks;
case SNDCTL_TMR_METRONOME:
- metronome_mode = *(int *) arg;
+ if (get_user(metronome_mode, p))
+ return -EFAULT;
setup_metronome(midi_dev);
return 0;
--- linux/drivers/sound/msnd.c.bak Wed Jun 16 14:42:24 2004
+++ linux/drivers/sound/msnd.c Wed Jun 16 14:42:34 2004
@@ -155,13 +155,10 @@ void msnd_fifo_make_empty(msnd_fifo *f)
f->len = f->tail = f->head = 0;
}
-int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user)
+int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len)
{
int count = 0;
- if (f->len == f->n)
- return 0;
-
while ((count < len) && (f->len != f->n)) {
int nwritten;
@@ -177,11 +174,7 @@ int msnd_fifo_write(msnd_fifo *f, const
nwritten = len - count;
}
- if (user) {
- if (copy_from_user(f->data + f->tail, buf, nwritten))
- return -EFAULT;
- } else
- isa_memcpy_fromio(f->data + f->tail, (unsigned long) buf, nwritten);
+ isa_memcpy_fromio(f->data + f->tail, (unsigned long) buf, nwritten);
count += nwritten;
buf += nwritten;
@@ -193,13 +186,10 @@ int msnd_fifo_write(msnd_fifo *f, const
return count;
}
-int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user)
+int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len)
{
int count = 0;
- if (f->len == 0)
- return f->len;
-
while ((count < len) && (f->len > 0)) {
int nread;
@@ -215,11 +205,7 @@ int msnd_fifo_read(msnd_fifo *f, char *b
nread = len - count;
}
- if (user) {
- if (copy_to_user(buf, f->data + f->head, nread))
- return -EFAULT;
- } else
- isa_memcpy_toio((unsigned long) buf, f->data + f->head, nread);
+ isa_memcpy_toio((unsigned long) buf, f->data + f->head, nread);
count += nread;
buf += nread;
--- linux/drivers/sound/msnd.h.bak Wed Jun 16 14:42:24 2004
+++ linux/drivers/sound/msnd.h Wed Jun 16 14:42:34 2004
@@ -266,8 +266,8 @@ void msnd_fifo_init(msnd_fifo *f);
void msnd_fifo_free(msnd_fifo *f);
int msnd_fifo_alloc(msnd_fifo *f, size_t n);
void msnd_fifo_make_empty(msnd_fifo *f);
-int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user);
-int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user);
+int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len);
+int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len);
int msnd_wait_TXDE(multisound_dev_t *dev);
int msnd_wait_HC0(multisound_dev_t *dev);
--- linux/drivers/sound/msnd_pinnacle.c.bak Wed Jun 16 14:42:24 2004
+++ linux/drivers/sound/msnd_pinnacle.c Wed Jun 16 14:42:34 2004
@@ -804,7 +804,7 @@ static int dev_release(struct inode *ino
static __inline__ int pack_DARQ_to_DARF(register int bank)
{
- register int size, n, timeout = 3;
+ register int size, timeout = 3;
register WORD wTmp;
LPDAQD DAQD;
@@ -825,13 +825,10 @@ static __inline__ int pack_DARQ_to_DARF(
/* Read data from the head (unprotected bank 1 access okay
since this is only called inside an interrupt) */
outb(HPBLKSEL_1, dev.io + HP_BLKS);
- if ((n = msnd_fifo_write(
+ msnd_fifo_write(
&dev.DARF,
(char *)(dev.base + bank * DAR_BUFF_SIZE),
- size, 0)) <= 0) {
- outb(HPBLKSEL_0, dev.io + HP_BLKS);
- return n;
- }
+ size);
outb(HPBLKSEL_0, dev.io + HP_BLKS);
return 1;
@@ -853,21 +850,16 @@ static __inline__ int pack_DAPF_to_DAPQ(
if (protect) {
/* Critical section: protect fifo in non-interrupt */
spin_lock_irqsave(&dev.lock, flags);
- if ((n = msnd_fifo_read(
+ n = msnd_fifo_read(
&dev.DAPF,
(char *)(dev.base + bank_num * DAP_BUFF_SIZE),
- DAP_BUFF_SIZE, 0)) < 0) {
- spin_unlock_irqrestore(&dev.lock, flags);
- return n;
- }
+ DAP_BUFF_SIZE);
spin_unlock_irqrestore(&dev.lock, flags);
} else {
- if ((n = msnd_fifo_read(
+ n = msnd_fifo_read(
&dev.DAPF,
(char *)(dev.base + bank_num * DAP_BUFF_SIZE),
- DAP_BUFF_SIZE, 0)) < 0) {
- return n;
- }
+ DAP_BUFF_SIZE);
}
if (!n)
break;
@@ -894,30 +886,43 @@ static __inline__ int pack_DAPF_to_DAPQ(
static int dsp_read(char *buf, size_t len)
{
int count = len;
+ char *page = (char *)__get_free_page(PAGE_SIZE);
+
+ if (!page)
+ return -ENOMEM;
while (count > 0) {
- int n;
+ int n, k;
unsigned long flags;
+ k = PAGE_SIZE;
+ if (k > count)
+ k = count;
+
/* Critical section: protect fifo in non-interrupt */
spin_lock_irqsave(&dev.lock, flags);
- if ((n = msnd_fifo_read(&dev.DARF, buf, count, 1)) < 0) {
- printk(KERN_WARNING LOGNAME ": FIFO read error\n");
- spin_unlock_irqrestore(&dev.lock, flags);
- return n;
- }
+ n = msnd_fifo_read(&dev.DARF, page, k);
spin_unlock_irqrestore(&dev.lock, flags);
+ if (copy_to_user(buf, page, n)) {
+ free_page((unsigned long)page);
+ return -EFAULT;
+ }
buf += n;
count -= n;
+ if (n == k && count)
+ continue;
+
if (!test_bit(F_READING, &dev.flags) && dev.mode & FMODE_READ) {
dev.last_recbank = -1;
if (chk_send_dsp_cmd(&dev, HDEX_RECORD_START) == 0)
set_bit(F_READING, &dev.flags);
}
- if (dev.rec_ndelay)
+ if (dev.rec_ndelay) {
+ free_page((unsigned long)page);
return count == len ? -EAGAIN : len - count;
+ }
if (count > 0) {
set_bit(F_READBLOCK, &dev.flags);
@@ -926,41 +931,57 @@ static int dsp_read(char *buf, size_t le
get_rec_delay_jiffies(DAR_BUFF_SIZE)))
clear_bit(F_READING, &dev.flags);
clear_bit(F_READBLOCK, &dev.flags);
- if (signal_pending(current))
+ if (signal_pending(current)) {
+ free_page((unsigned long)page);
return -EINTR;
+ }
}
}
-
+ free_page((unsigned long)page);
return len - count;
}
static int dsp_write(const char *buf, size_t len)
{
int count = len;
+ char *page = (char *)__get_free_page(GFP_KERNEL);
+
+ if (!page)
+ return -ENOMEM;
while (count > 0) {
- int n;
+ int n, k;
unsigned long flags;
+ k = PAGE_SIZE;
+ if (k > count)
+ k = count;
+
+ if (copy_from_user(page, buf, k)) {
+ free_page((unsigned long)page);
+ return -EFAULT;
+ }
+
/* Critical section: protect fifo in non-interrupt */
spin_lock_irqsave(&dev.lock, flags);
- if ((n = msnd_fifo_write(&dev.DAPF, buf, count, 1)) < 0) {
- printk(KERN_WARNING LOGNAME ": FIFO write error\n");
- spin_unlock_irqrestore(&dev.lock, flags);
- return n;
- }
+ n = msnd_fifo_write(&dev.DAPF, page, k);
spin_unlock_irqrestore(&dev.lock, flags);
buf += n;
count -= n;
+ if (count && n == k)
+ continue;
+
if (!test_bit(F_WRITING, &dev.flags) && (dev.mode & FMODE_WRITE)) {
dev.last_playbank = -1;
if (pack_DAPF_to_DAPQ(1) > 0)
set_bit(F_WRITING, &dev.flags);
}
- if (dev.play_ndelay)
+ if (dev.play_ndelay) {
+ free_page((unsigned long)page);
return count == len ? -EAGAIN : len - count;
+ }
if (count > 0) {
set_bit(F_WRITEBLOCK, &dev.flags);
@@ -968,11 +989,14 @@ static int dsp_write(const char *buf, si
&dev.writeblock,
get_play_delay_jiffies(DAP_BUFF_SIZE));
clear_bit(F_WRITEBLOCK, &dev.flags);
- if (signal_pending(current))
+ if (signal_pending(current)) {
+ free_page((unsigned long)page);
return -EINTR;
+ }
}
}
+ free_page((unsigned long)page);
return len - count;
}
--- linux/drivers/sound/pss.c.bak Wed Jun 16 14:42:24 2004
+++ linux/drivers/sound/pss.c Wed Jun 16 14:42:34 2004
@@ -450,20 +450,36 @@ static void pss_mixer_reset(pss_confdata
}
}
-static void arg_to_volume_mono(unsigned int volume, int *aleft)
+static int set_volume_mono(caddr_t p, int *aleft)
{
int left;
+ unsigned volume;
+ if (get_user(volume, (unsigned *)p))
+ return -EFAULT;
- left = volume & 0x00ff;
+ left = volume & 0xff;
if (left > 100)
left = 100;
*aleft = left;
+ return 0;
}
-static void arg_to_volume_stereo(unsigned int volume, int *aleft, int *aright)
+static int set_volume_stereo(caddr_t p, int *aleft, int *aright)
{
- arg_to_volume_mono(volume, aleft);
- arg_to_volume_mono(volume >> 8, aright);
+ int left, right;
+ unsigned volume;
+ if (get_user(volume, (unsigned *)p))
+ return -EFAULT;
+
+ left = volume & 0xff;
+ if (left > 100)
+ left = 100;
+ right = (volume >> 8) & 0xff;
+ if (right > 100)
+ right = 100;
+ *aleft = left;
+ *aright = right;
+ return 0;
}
static int ret_vol_mono(int left)
@@ -510,33 +526,38 @@ static int pss_mixer_ioctl (int dev, uns
return call_ad_mixer(devc, cmd, arg);
else
{
- if (*(int *)arg != 0)
+ int v;
+ if (get_user(v, (int *)arg))
+ return -EFAULT;
+ if (v != 0)
return -EINVAL;
return 0;
}
case SOUND_MIXER_VOLUME:
- arg_to_volume_stereo(*(unsigned int *)arg, &devc->mixer.volume_l,
- &devc->mixer.volume_r);
+ if (set_volume_stereo(arg,
+ &devc->mixer.volume_l,
+ &devc->mixer.volume_r))
+ return -EFAULT;
set_master_volume(devc, devc->mixer.volume_l,
devc->mixer.volume_r);
return ret_vol_stereo(devc->mixer.volume_l,
devc->mixer.volume_r);
case SOUND_MIXER_BASS:
- arg_to_volume_mono(*(unsigned int *)arg,
- &devc->mixer.bass);
+ if (set_volume_mono(arg, &devc->mixer.bass))
+ return -EFAULT;
set_bass(devc, devc->mixer.bass);
return ret_vol_mono(devc->mixer.bass);
case SOUND_MIXER_TREBLE:
- arg_to_volume_mono(*(unsigned int *)arg,
- &devc->mixer.treble);
+ if (set_volume_mono(arg, &devc->mixer.treble))
+ return -EFAULT;
set_treble(devc, devc->mixer.treble);
return ret_vol_mono(devc->mixer.treble);
case SOUND_MIXER_SYNTH:
- arg_to_volume_mono(*(unsigned int *)arg,
- &devc->mixer.synth);
+ if (set_volume_mono(arg, &devc->mixer.synth))
+ return -EFAULT;
set_synth_volume(devc, devc->mixer.synth);
return ret_vol_mono(devc->mixer.synth);
@@ -546,54 +567,67 @@ static int pss_mixer_ioctl (int dev, uns
}
else
{
+ int val, and_mask = 0, or_mask = 0;
/*
* Return parameters
*/
switch (cmdf)
{
-
case SOUND_MIXER_DEVMASK:
if (call_ad_mixer(devc, cmd, arg) == -EINVAL)
- *(int *)arg = 0; /* no mixer devices */
- return (*(int *)arg |= SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH);
+ break;
+ and_mask = ~0;
+ or_mask = SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH;
+ break;
case SOUND_MIXER_STEREODEVS:
if (call_ad_mixer(devc, cmd, arg) == -EINVAL)
- *(int *)arg = 0; /* no stereo devices */
- return (*(int *)arg |= SOUND_MASK_VOLUME);
+ break;
+ and_mask = ~0;
+ or_mask = SOUND_MASK_VOLUME;
+ break;
case SOUND_MIXER_RECMASK:
if (devc->ad_mixer_dev != NO_WSS_MIXER)
return call_ad_mixer(devc, cmd, arg);
- else
- return (*(int *)arg = 0); /* no record devices */
+ break;
case SOUND_MIXER_CAPS:
if (devc->ad_mixer_dev != NO_WSS_MIXER)
return call_ad_mixer(devc, cmd, arg);
- else
- return (*(int *)arg = SOUND_CAP_EXCL_INPUT);
+ or_mask = SOUND_CAP_EXCL_INPUT;
+ break;
case SOUND_MIXER_RECSRC:
if (devc->ad_mixer_dev != NO_WSS_MIXER)
return call_ad_mixer(devc, cmd, arg);
- else
- return (*(int *)arg = 0); /* no record source */
+ break;
case SOUND_MIXER_VOLUME:
- return (*(int *)arg = ret_vol_stereo(devc->mixer.volume_l, devc->mixer.volume_r));
+ or_mask = ret_vol_stereo(devc->mixer.volume_l, devc->mixer.volume_r);
+ break;
case SOUND_MIXER_BASS:
- return (*(int *)arg = ret_vol_mono(devc->mixer.bass));
+ or_mask = ret_vol_mono(devc->mixer.bass);
+ break;
case SOUND_MIXER_TREBLE:
- return (*(int *)arg = ret_vol_mono(devc->mixer.treble));
+ or_mask = ret_vol_mono(devc->mixer.treble);
+ break;
case SOUND_MIXER_SYNTH:
- return (*(int *)arg = ret_vol_mono(devc->mixer.synth));
+ or_mask = ret_vol_mono(devc->mixer.synth);
+ break;
default:
return -EINVAL;
}
+ if (get_user(val, (int *)arg))
+ return -EFAULT;
+ val &= and_mask;
+ val |= or_mask;
+ if (put_user(val, (int *)arg))
+ return -EFAULT;
+ return val;
}
}

View File

@ -0,0 +1,12 @@
--- drivers/net/e1000/e1000_ethtool.c 2003-06-13 15:51:34.000000000 +0100
+++ drivers/net/e1000/e1000_ethtool.c.plasmaroo 2004-06-24 11:23:32.524963976 +0100
@@ -468,6 +468,9 @@
if(copy_from_user(&regs, addr, sizeof(regs)))
return -EFAULT;
+ memset(regs_buff, 0, sizeof(regs_buff));
+ if (regs.len > E1000_REGS_LEN)
+ regs.len = E1000_REGS_LEN;
e1000_ethtool_gregs(adapter, &regs, regs_buff);
if(copy_to_user(addr, &regs, sizeof(regs)))
return -EFAULT;

View File

@ -0,0 +1,83 @@
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/07/26 19:14:16-03:00 mjc@redhat.com
# [PATCH] USB: more sparse fixes
#
# Back in October 2003 Arnaldo commited some fixes prior to 2.6 for some leaking info to userspace in the
# usb drivers:
# http://linux.bkbits.net:8080/linux-2.6/cset@3f986b35LyBKc-OxB8G6k22oOjgYTQ
#
# The corresponding changes have not been commited to 2.4, or included in
# the previous sparse fixes.
#
# drivers/usb/audio.c
# 2004/07/15 08:46:52-03:00 mjc@redhat.com +4 -0
# USB: more sparse fixes
#
# drivers/usb/brlvger.c
# 2004/07/15 08:47:27-03:00 mjc@redhat.com +1 -0
# USB: more sparse fixes
#
# drivers/usb/serial/io_edgeport.c
# 2004/07/15 08:48:06-03:00 mjc@redhat.com +1 -0
# USB: more sparse fixes
#
# drivers/usb/vicam.c
# 2004/07/15 08:47:13-03:00 mjc@redhat.com +1 -0
# USB: more sparse fixes
#
diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c
--- a/drivers/usb/audio.c 2004-08-08 07:41:30 -07:00
+++ b/drivers/usb/audio.c 2004-08-08 07:41:30 -07:00
@@ -2141,6 +2141,8 @@
if (cmd == SOUND_MIXER_INFO) {
mixer_info info;
+
+ memset(&info, 0, sizeof(info));
strncpy(info.id, "USB_AUDIO", sizeof(info.id));
strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
info.modify_counter = ms->modcnt;
@@ -2150,6 +2152,8 @@
}
if (cmd == SOUND_OLD_MIXER_INFO) {
_old_mixer_info info;
+
+ memset(&info, 0, sizeof(info));
strncpy(info.id, "USB_AUDIO", sizeof(info.id));
strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
if (copy_to_user((void *)arg, &info, sizeof(info)))
diff -Nru a/drivers/usb/brlvger.c b/drivers/usb/brlvger.c
--- a/drivers/usb/brlvger.c 2004-08-08 07:41:30 -07:00
+++ b/drivers/usb/brlvger.c 2004-08-08 07:41:30 -07:00
@@ -743,6 +743,7 @@
case BRLVGER_GET_INFO: {
struct brlvger_info vi;
+ memset(&vi, 0, sizeof(vi));
strncpy(vi.driver_version, DRIVER_VERSION,
sizeof(vi.driver_version));
vi.driver_version[sizeof(vi.driver_version)-1] = 0;
diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
--- a/drivers/usb/serial/io_edgeport.c 2004-08-08 07:41:30 -07:00
+++ b/drivers/usb/serial/io_edgeport.c 2004-08-08 07:41:30 -07:00
@@ -1913,6 +1913,7 @@
case TIOCGICOUNT:
cnow = edge_port->icount;
+ memset(&icount, 0, sizeof(icount));
icount.cts = cnow.cts;
icount.dsr = cnow.dsr;
icount.rng = cnow.rng;
diff -Nru a/drivers/usb/vicam.c b/drivers/usb/vicam.c
--- a/drivers/usb/vicam.c 2004-08-08 07:41:30 -07:00
+++ b/drivers/usb/vicam.c 2004-08-08 07:41:30 -07:00
@@ -481,6 +481,7 @@
struct video_capability b;
DBG("VIDIOCGCAP\n");
+ memset(&b, 0, sizeof(b));
strcpy(b.name, "ViCam-based Camera");
b.type = VID_TYPE_CAPTURE;
b.channels = 1;

View File

@ -0,0 +1,11 @@
--- linux-2.4/include/asm-i386/i387.h 2004-06-13 20:06:05.044881328 +0100
+++ linux-2.4/include/asm-i386/i387.h 2004-06-13 20:25:42.836829736 +0100
@@ -34,7 +34,7 @@
#define clear_fpu( tsk ) do { \
if ( tsk->flags & PF_USEDFPU ) { \
- asm volatile("fwait"); \
+ asm volatile("fnclex ; fwait"); \
tsk->flags &= ~PF_USEDFPU; \
stts(); \
} \

View File

@ -0,0 +1,11 @@
--- linux-2.4/fs/proc/base.c 2004-04-15 07:09:32.000000000 +0100
+++ linux-2.4/fs/proc/base.c.plasmaroo 2004-08-09 23:30:43.869195800 +0100
@@ -187,7 +187,7 @@ static int proc_pid_cmdline(struct task_
if (mm)
atomic_inc(&mm->mm_users);
task_unlock(task);
- if (mm) {
+ if (mm && mm->arg_end) {
int len = mm->arg_end - mm->arg_start;
if (len > PAGE_SIZE)
len = PAGE_SIZE;

View File

@ -0,0 +1,24 @@
diff -Nru a/include/asm-i386/i387.h b/include/asm-i386/i387.h
--- a/include/asm-i386/i387.h 2004-05-06 12:26:10 -07:00
+++ b/include/asm-i386/i387.h 2004-06-12 19:12:23 -07:00
@@ -51,7 +51,7 @@
#define __clear_fpu( tsk ) \
do { \
if ((tsk)->thread_info->status & TS_USEDFPU) { \
- asm volatile("fwait"); \
+ asm volatile("fnclex ; fwait"); \
(tsk)->thread_info->status &= ~TS_USEDFPU; \
stts(); \
} \
diff -Nru a/include/asm-x86_64/i387.h b/include/asm-x86_64/i387.h
--- a/include/asm-x86_64/i387.h 2004-06-13 20:43:56.742530792 +0100
+++ a/include/asm-x86_64/i387.h 2004-06-13 20:42:59.200278544 +0100
@@ -46,7 +46,7 @@
#define clear_fpu(tsk) do { \
if ((tsk)->thread_info->status & TS_USEDFPU) { \
- asm volatile("fwait"); \
+ asm volatile("fnclex; fwait"); \
(tsk)->thread_info->status &= ~TS_USEDFPU; \
stts(); \
} \

View File

@ -0,0 +1,46 @@
--- 1.13/drivers/net/eql.c 2004-07-21 03:13:40 -07:00
+++ 1.14/drivers/net/eql.c 2004-07-21 03:13:40 -07:00
@@ -495,6 +495,8 @@
return -EFAULT;
slave_dev = dev_get_by_name(sc.slave_name);
+ if (!slave_dev)
+ return -ENODEV;
ret = -EINVAL;
@@ -527,11 +529,13 @@
if (copy_from_user(&sc, scp, sizeof (slave_config_t)))
return -EFAULT;
- eql = dev->priv;
slave_dev = dev_get_by_name(sc.slave_name);
+ if (!slave_dev)
+ return -ENODEV;
ret = -EINVAL;
+ eql = dev->priv;
spin_lock_bh(&eql->queue.lock);
if (eql_is_slave(slave_dev)) {
slave = __eql_find_slave_dev(&eql->queue, slave_dev);
--- 1.14/drivers/net/eql.c 2004-07-21 03:13:33 -07:00
+++ 1.15/drivers/net/eql.c 2004-07-21 03:13:33 -07:00
@@ -499,6 +499,8 @@
return -ENODEV;
ret = -EINVAL;
+ if (!slave_dev)
+ return ret;
spin_lock_bh(&eql->queue.lock);
if (eql_is_slave(slave_dev)) {
@@ -534,6 +536,8 @@
return -ENODEV;
ret = -EINVAL;
+ if (!slave_dev)
+ return ret;
eql = dev->priv;
spin_lock_bh(&eql->queue.lock);

View File

@ -0,0 +1,43 @@
Subject: Prevent ICMP crash in netfilter logging
From: Olaf Kirch <okir@suse.de>
References: 46016
This patch fixes a remotely triggerable crash in the netfilter code
when looking at ICMP unreachables. It dies when trying to copy
BIGNUM bytes...
Index: linux-2.6.5/net/ipv4/netfilter/ipt_LOG.c
===================================================================
--- linux-2.6.5.orig/net/ipv4/netfilter/ipt_LOG.c 2004-02-19 11:36:37.000000000 +0100
+++ linux-2.6.5/net/ipv4/netfilter/ipt_LOG.c 2004-09-24 15:48:54.000000000 +0200
@@ -71,7 +71,7 @@
printk("FRAG:%u ", ntohs(iph.frag_off) & IP_OFFSET);
if ((info->logflags & IPT_LOG_IPOPT)
- && iph.ihl * 4 != sizeof(struct iphdr)) {
+ && iph.ihl * 4 > sizeof(struct iphdr)) {
unsigned char opt[4 * 15 - sizeof(struct iphdr)];
unsigned int i, optsize;
@@ -138,7 +138,7 @@
printk("URGP=%u ", ntohs(tcph.urg_ptr));
if ((info->logflags & IPT_LOG_TCPOPT)
- && tcph.doff * 4 != sizeof(struct tcphdr)) {
+ && tcph.doff * 4 > sizeof(struct tcphdr)) {
unsigned char opt[4 * 15 - sizeof(struct tcphdr)];
unsigned int i, optsize;
Index: linux-2.6.5/net/ipv6/netfilter/ip6t_LOG.c
===================================================================
--- linux-2.6.5.orig/net/ipv6/netfilter/ip6t_LOG.c 2004-09-24 15:47:00.000000000 +0200
+++ linux-2.6.5/net/ipv6/netfilter/ip6t_LOG.c 2004-09-24 15:48:35.000000000 +0200
@@ -188,7 +188,7 @@
printk("URGP=%u ", ntohs(tcph->urg_ptr));
if ((info->logflags & IP6T_LOG_TCPOPT)
- && tcph->doff * 4 != sizeof(struct tcphdr)) {
+ && tcph->doff * 4 > sizeof(struct tcphdr)) {
unsigned int i;
/* Max length: 127 "OPT (" 15*4*2chars ") " */

View File

@ -0,0 +1,11 @@
--- net/ipv4/netfilter/ip_tables.c.orig 2004-04-04 05:36:47.000000000 +0200
+++ net/ipv4/netfilter/ip_tables.c 2004-06-24 21:24:26.000000000 +0200
@@ -1461,7 +1461,7 @@
int *hotdrop)
{
/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
- char opt[60 - sizeof(struct tcphdr)];
+ u_int8_t opt[60 - sizeof(struct tcphdr)];
unsigned int i;
duprintf("tcp_match: finding option\n");

View File

@ -0,0 +1,49 @@
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/07/02 18:48:26-07:00 chrisw@osdl.org
# [PATCH] check attr updates in /proc
#
# Any proc entry with default proc_file_inode_operations allow unauthorized
# attribute updates. This is very dangerous for proc entries that rely
# solely on file permissions for open/read/write.
#
# Signed-off-by: Chris Wright <chrisw@osdl.org>
# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
#
# fs/proc/generic.c
# 2004/07/02 15:47:55-07:00 chrisw@osdl.org +14 -7
# check attr updates in /proc
#
diff -Nru a/fs/proc/generic.c b/fs/proc/generic.c
--- a/fs/proc/generic.c 2004-07-08 17:03:20 -07:00
+++ b/fs/proc/generic.c 2004-07-08 17:03:20 -07:00
@@ -231,14 +231,21 @@
static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
{
struct inode *inode = dentry->d_inode;
- int error = inode_setattr(inode, iattr);
- if (!error) {
- struct proc_dir_entry *de = PDE(inode);
- de->uid = inode->i_uid;
- de->gid = inode->i_gid;
- de->mode = inode->i_mode;
- }
+ struct proc_dir_entry *de = PDE(inode);
+ int error;
+ error = inode_change_ok(inode, iattr);
+ if (error)
+ goto out;
+
+ error = inode_setattr(inode, iattr);
+ if (error)
+ goto out;
+
+ de->uid = inode->i_uid;
+ de->gid = inode->i_gid;
+ de->mode = inode->i_mode;
+out:
return error;
}

View File

@ -0,0 +1,12 @@
--- linux-2.6.7/fs/proc/base.c~ 2004-08-05 10:35:04.411443536 +0200
+++ linux-2.6.7/fs/proc/base.c 2004-08-05 10:35:04.412443384 +0200
@@ -330,6 +330,9 @@
if (!mm)
goto out;
+ if (!mm->arg_end)
+ goto out;
+
len = mm->arg_end - mm->arg_start;
if (len > PAGE_SIZE)

View File

@ -0,0 +1,26 @@
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/07/02 20:55:04-07:00 chrisw@osdl.org
# [PATCH] chown permission check fix for ATTR_GID
#
# SuSE discovered this problem with chown and ATTR_GID. Make sure user
# is authorized to change the group, CAN-2004-0497.
#
# fs/attr.c
# 2004/07/02 09:07:32-07:00 chrisw@osdl.org +2 -1
# chown permission check fix for ATTR_GID
#
diff -Nru a/fs/attr.c b/fs/attr.c
--- a/fs/attr.c 2004-07-08 16:35:57 -07:00
+++ b/fs/attr.c 2004-07-08 16:35:57 -07:00
@@ -35,7 +35,8 @@
/* Make sure caller can chgrp. */
if ((ia_valid & ATTR_GID) &&
- (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
+ (current->fsuid != inode->i_uid ||
+ (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
!capable(CAP_CHOWN))
goto error;

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kernel</herd>
<maintainer>
<email>plasmaroo@gentoo.org</email>
</maintainer>
<maintainer>
<email>x86-kernel@gentoo.org</email>
</maintainer>
</pkgmetadata>

View File

@ -0,0 +1,44 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r6.ebuild,v 1.1 2004/08/10 00:52:17 plasmaroo Exp $
# OKV=original kernel version, KV=patched kernel version. They can be the same.
IUSE=""
ETYPE="sources"
inherit kernel eutils
OKV="2.4.26"
EXTRAVERSION="-win4lin-${PR}"
KV="2.4.26${EXTRAVERSION}"
S=${WORKDIR}/linux-${KV}
DESCRIPTION="Full sources for the Linux kernel, with Win4Lin support."
SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
http://www.netraverse.com/member/downloads/files/mki-adapter.patch
http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch
http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/"
KEYWORDS="x86"
SLOT="${KV}"
src_unpack() {
unpack linux-${OKV}.tar.bz2
mv linux-${OKV} linux-${KV} || die
cd linux-${KV}
epatch ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch || die "Error: Win4Lin3 patch failed."
ebegin 'Applying mki-adapter.patch'
patch -Np1 -i ${DISTDIR}/mki-adapter.patch >/dev/null 2>&1 || die "Error: mki-adapter patch failed."
eend $?
epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
epatch ${FILESDIR}/${P}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
epatch ${FILESDIR}/${P}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
epatch ${FILESDIR}/${P}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
kernel_universal_unpack
}

View File

@ -0,0 +1,37 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r6.ebuild,v 1.1 2004/10/21 18:33:36 plasmaroo Exp $
ETYPE="sources"
inherit kernel-2
detect_version
MKI_VERSION='1_3_6'
UNIPATCH_LIST="
${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch:1
${FILESDIR}/${PN}.CAN-2004-0497.patch
${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch
${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch
${FILESDIR}/${PN}-2.6.ProcPerms.patch
${FILESDIR}/${PN}-2.6.cmdlineLeak.patch
${FILESDIR}/${PN}-2.6.CAN-2004-0816.patch"
S=${WORKDIR}/linux-${KV}
DESCRIPTION="Full sources for the 2.6 of the Linux kernel with the Win4Lin patches"
SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
http://www.netraverse.com/member/downloads/files/mki-adapter26_${MKI_VERSION}.patch
http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch
http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
# Best to keep "~x86" until Win4Lin-5.1.10 is in the tree and stable;
# bug #55587.
KEYWORDS="~x86 -*"
SLOT="${KV}"
K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
existing bug. Only create a new bug if you have not found one that matches
your issue. It is best to do an advanced search as the initial search has a
very low yield. Please assign your bugs to x86-kernel@gentoo.org."