KBrown/gentoo-overlay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into KBrown-pub

Browse source
This commit is contained in:
Sandino Araico Sanchez 2017-03-28 16:23:55 -06:00
commit 2be6b9f9e0
13 changed files with 5072 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev-libs/libressl/Manifest
View file

@ -2,6 +2,10 @@ AUX libressl-2.2.4-clientcert.patch 1387 SHA256 a9a4038c02e6c21fb927141695da600f
DIST libressl-2.2.5.tar.gz 2966527 SHA256 e3caded0469d8dc64f4ca2fe8e499ada4dd014e84d1c5a71818d39e54e6c914b SHA512 501d04cb966260854082d374e60aabde21bcd65a331ff7c76044f2053b22ddab4914710b223b400a3a181873c6af5e2e7da5f04bdd9028fddbf420e259a2863a WHIRLPOOL 47f7d35ceff5004af0c2f79509678c4826eabe05225dbcf5cbe1f9cb358d1657ff288a702e14bfd578fd03e38256d2aa2c79ec724a05c98aa91317e6a9a5f9d4
DIST libressl-2.2.6.tar.gz 2965531 SHA256 1ee19994cffd047d40f63ba149115dba18a681b0cc923beec301bf424b58d64f SHA512 41e29431ad9e8b18e2dbc30fe9df1d7be3ca372d5d7757b5b01f8904515bafd5333446957fbc9874f64f384dae56cf6bf29d6808a7c0df1836b55ea64804a4bf WHIRLPOOL 49b6efa211ea4789e51388d3ebfec941dfedad427b806b33d439a7639e09d16e5c9004edc4a4c8e3de63040ebc2fe0a3a3819c68ed674e3bb36bb52b49e75ce5
DIST libressl-2.5.0.tar.gz 3012855 SHA256 8652bf6b55ab51fb37b686a3f604a2643e0e8fde2c56e6a936027d12afda6eae SHA512 6372b27f1696e957389646a05b0572ad6936443b34fee0e57153b063831e00318fa1b434e3e0369f0c3df872e15ad3bee2f85db0851021444612f2a6f266a332 WHIRLPOOL 9b145915734a1914f0d36df04a8b35aa2ce2c91f7d6b3a978c5c6845314c56c61718fce6c471ba1a03f3d1ff052246c3db767adee99bc3d38a6bd692b9086ad0
DIST libressl-2.5.1.tar.gz 3266271 SHA256 f71ae0a824b78fb1a47ffa23c9c26e9d96c5c9b29234eacedce6b4c7740287cd SHA512 44557c7c3e6bc9c0af9ae83b26765be9707d53708a32a5a945108a49ea20503afa4197919801830d27821c069b87e0e0edd284bd1b8a85340dbc0da2c162c2f9 WHIRLPOOL e31b487e9e88f372cd22db05e54e74900181120cf8c6105f5531658e7b467722680921f3630b8943ee0ec5f5777cb76a7ddc64e4d43f166903928aaa4f98509c
DIST libressl-2.5.2.tar.gz 3277320 SHA256 0ffa7d70809284a4ac96e965918a61c1d7930bca865457a7db0ff0afc8201c82 SHA512 2c42b8bab40dfb517231d83456073c92a61210a83654f23bec1b5148bd7e3c0590f50244970ebf966e5e9582ea98289fe48c6f246d1d79e5d9facea2041e4faa WHIRLPOOL fc1dba52049779bf55a39a88abff8db8cfa3ba0d437dfacefa372d64e9859d7904848ba146a54064f70b79d0febea666757981ff4268699ac22a6cd8b5f3bc73
EBUILD libressl-2.2.5.ebuild 1054 SHA256 142e8949dd994b073f5534eec5179e0279b0355db8d19706ae79fec884fd8e50 SHA512 857a5a4f515b0d3da119afbe887904f22d4dc4604c6a79356babe7153780fd1891f8a2669a60fc6a21306b87489f49da5b9b025c9b7bfd7c77769f375c02999a WHIRLPOOL 045e3fc06a6756d388ac812275e7d356882ef060dca81ec842b843015169e16d21321135e3b16e56ffe61964d625fb3df279013dbecb865a8d3c54d8b47fc723
EBUILD libressl-2.2.6.ebuild 1054 SHA256 3fab9e63f6de19c5b8f72004eb07683bf4f6258ca6ba4e894d8bfdd7bda4ca7d SHA512 5c0b1cc0cec3b2377ecaef9656abdff5423d4ec3382c40efd1755af7aa381c9ff776d163d66bbd02e0f5aae7d77817d9bbb5add36b3d7bc79f1f8ab8fa8760f5 WHIRLPOOL ff305eb21f44a422b921164114d115b8f8942b79b78316181423a2bee71ac9f93a8308c777722f1fe0af0661649dfa7b8d3e357f98073a80783a64a3a97f5ccf
EBUILD libressl-2.5.0-r1.ebuild 1229 SHA256 3012d42d7b9f4294825c234106177dfa5c8e323b9e95adcae870d37d6cfd6a7a SHA512 7f52efcd5891c2b758b595ba3985114bc3ee994de190a1a8fbf6cf2022c4cc45f4b40a3ef0e5b23ca16c17b47600b23e146348016b0c1a8f6b8b4733feb5614a WHIRLPOOL f6ddc4a0cef44805b5fbf7d90d338b9a7f622297edc7bb522ed46b521234799fd1b64390cd937ef0a87259f5d91d6190172a8b5eb809373895d4bc73dcb52909
EBUILD libressl-2.5.1-r100.ebuild 1243 SHA256 f866bdbf7e3d93c54be85ff3aa34daa53e9aeacf0603d7a3097fe9b85f3c98cb SHA512 8c589126549842d807aeed4800f036097011556ef6615d02b3703f0335247322c52f7115b1d1efde900e291f4df4fe4beabf396b4d45b7841c34911aacc9f8e4 WHIRLPOOL ad33df3b7360c9d149af41c5377709e7f2d2de6994d839c1ee0ab708477ee4433fce3c0bec479e91a3f1fed3d194bd28b0df3f7dd5d3cea383828a21a997088a
EBUILD libressl-2.5.2-r100.ebuild 1243 SHA256 f866bdbf7e3d93c54be85ff3aa34daa53e9aeacf0603d7a3097fe9b85f3c98cb SHA512 8c589126549842d807aeed4800f036097011556ef6615d02b3703f0335247322c52f7115b1d1efde900e291f4df4fe4beabf396b4d45b7841c34911aacc9f8e4 WHIRLPOOL ad33df3b7360c9d149af41c5377709e7f2d2de6994d839c1ee0ab708477ee4433fce3c0bec479e91a3f1fed3d194bd28b0df3f7dd5d3cea383828a21a997088a

50
dev-libs/libressl/libressl-2.5.1-r100.ebuild Normal file
View file

@ -0,0 +1,50 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils multilib-minimal
DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
HOMEPAGE="http://www.libressl.org/"
SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
LICENSE="ISC openssl"
# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
# we'll try to use the max of either. However, if either change between
# versions, we have to change the subslot to trigger rebuild of consumers.
SLOT="0/43"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
IUSE="+asm static-libs"
PDEPEND="app-misc/ca-certificates"
src_prepare() {
touch crypto/Makefile.in
sed -i \
-e '/^[ \t]*CFLAGS=/s#-g ##' \
-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
configure || die "fixing CFLAGS failed"
eapply_user
}
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable asm) \
$(use_enable static-libs static)
}
multilib_src_test() {
emake check
}
multilib_src_install_all() {
einstalldocs
prune_libtool_files
}

50
dev-libs/libressl/libressl-2.5.2-r100.ebuild Normal file
View file

@ -0,0 +1,50 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils multilib-minimal
DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
HOMEPAGE="http://www.libressl.org/"
SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
LICENSE="ISC openssl"
# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
# we'll try to use the max of either. However, if either change between
# versions, we have to change the subslot to trigger rebuild of consumers.
SLOT="0/43"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
IUSE="+asm static-libs"
PDEPEND="app-misc/ca-certificates"
src_prepare() {
touch crypto/Makefile.in
sed -i \
-e '/^[ \t]*CFLAGS=/s#-g ##' \
-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
configure || die "fixing CFLAGS failed"
eapply_user
}
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable asm) \
$(use_enable static-libs static)
}
multilib_src_test() {
emake check
}
multilib_src_install_all() {
einstalldocs
prune_libtool_files
}

2
dev-libs/openssl/Manifest
View file

@ -1 +1 @@
EBUILD openssl-9999.ebuild 473 SHA256 bfce34844c7d951322001415b8dd05faa8d6639e47478c0dba049ac67bb75fc6 SHA512 1e21f1b3a1faf0eb1cff2be2fc2eb7860ae9dc1b6aebdca35d6c6f42fafa458a7c62df6a7794069f1ad6fd1520f4f5ae3e862f661ce453132ee2b75c6c847356 WHIRLPOOL 9d0caf920de1db71a2aaa3785228c60b0b2aa7ded4df31e4215b26e051fe239b103ede7b15c1024d2f1722aa8bf98a3643e5b93a2d3d5bb38273cddcf0527453
EBUILD openssl-9998.ebuild 473 SHA256 bfce34844c7d951322001415b8dd05faa8d6639e47478c0dba049ac67bb75fc6 SHA512 1e21f1b3a1faf0eb1cff2be2fc2eb7860ae9dc1b6aebdca35d6c6f42fafa458a7c62df6a7794069f1ad6fd1520f4f5ae3e862f661ce453132ee2b75c6c847356 WHIRLPOOL 9d0caf920de1db71a2aaa3785228c60b0b2aa7ded4df31e4215b26e051fe239b103ede7b15c1024d2f1722aa8bf98a3643e5b93a2d3d5bb38273cddcf0527453

0
dev-libs/openssl/openssl-9999.ebuild → dev-libs/openssl/openssl-9998.ebuild
View file

8
media-video/darwin-streaming-server/Manifest Normal file
View file

@ -0,0 +1,8 @@
AUX darwin-streaming-server-6.0.3-gentoo.patch 13111 SHA256 a6d1ce2bd2104b323146b36ccf993cc704f8b430dc05e050e4c885b7e5d90a1b SHA512 12f6ed25fea87258ecf526eb62499ba3db82a9b287f3fd754767a251b812ed86132bfb9a31e790c97036b10956e8369698b3baedf1b6f24757c1a423a7a5e11a WHIRLPOOL afb27a37b752e9f97019586c75d6bf641b41728602d6b6e71f006e28bb7aafd604c3508ab9c82d52aa0c8d1427b3556bdfebdd36786b3595243e22eba1755646
AUX darwin-streaming-server-6.0.3-linux.patch 15014 SHA256 13741e14f704d3b0db00100c9213ff0bec104403622905e92f370d846bf8f2ea SHA512 299e330fd39a263ffebb573b9c5c8b264b203ba9cab108d074f34234491f25d84a929c3bfee045655abdb2564ea8201c0abebbdc36d5ee70399b3684a8c23f50 WHIRLPOOL 530594f6bb637adada9ee7e418bfdffc0c29a6861885c1fedc4f4a68e634388e2133794812af5e4a500ffb6e8267f6d2c7a4b2abc1ff7bab7c4967e1f958206a
AUX darwin-streaming-server-6.0.3-ppc64.patch 1841 SHA256 bc014c9ad7c359c2a9701f8953a36b3f30095c211138009462cc54febe4494d9 SHA512 bb1f33fff0f69d8d4d3b6d6ea31d43ad44ff29ddc876225f48e655a284a279b478d3f24fc3b540b1445efb0e3ca86bf9c41e9215b9e1d0b4aab6a69221055d0f WHIRLPOOL d168549a24b1451f42260022bdcde9986d667194c208f228e1b5004d89b835cbf342a61b18389c0f30d869d38793d0165146572f02eab074634f55100e35a5f2
AUX darwin-streaming-server-6.0.3-x86_64-m32.patch 561 SHA256 91587215f9e5d040003af94a27bd85c553ccd62c4c2c650182ec5beecf35449e SHA512 63509e0330e39689e2a43a3412bb7429c920da166c483cfe0af7f648159d3a2579dfdb701e658063a1acda57a185e375ce1fde63dd5fe38dfaf8f0b1191b9448 WHIRLPOOL 58e901dcb6581818ced069cdc0f6151a48636653013e158607220eb779fc7103762680ad86a596c758cdaf7624665cf49700bbf1794b8d8cc80aa5e44796eb1b
AUX darwin-streaming-server-6.0.3-x86_64.patch 173414 SHA256 e328e21c4b49075d7ac8bdd0d1227f68f3a6812ecd7eeef27064effdf095609e SHA512 1506acdaa97c044e89015a8762ebe4d970a61d39246d396b0ab769b98a5de426d0278eb4d6e5d1c6484fe16f14c64f578737199fee528546ea1ea03215fe6276 WHIRLPOOL 7d415c9cfe1ccac10a00a86e59716b216968cf168685a76278b6e730c95d1efc976f98e6a829127da584457714d0e64c7735a64d8afbde08efb2a68a988bdd57
AUX dss.rc 598 SHA256 5743205e13a3682f1aebf9c95bb95c74d68fc4b752b7517bd56ddfa6e0f36003 SHA512 91a65b1ecabb14f081e32c591736eb8d1651c1c4b68859c92ad6afa70639d3fdf2153521f1817b13505812cd07e5d11e19a4ddcd9a21fc761259b456276745bf WHIRLPOOL 65b3780e9ba1f5fa2e3a65a500e0f82c7782bc1caed24df41b233ece183ada58eb75f4035a156be601db7a6a342656bb0ca95c156696cab393832b8ce652b514
DIST DarwinStreamingSrvr6.0.3-Source.tar 32593920 SHA256 7bf75ced3f603f55c6f7601bfecd9f26393ea98be821d24169f2091843706522 SHA512 f507c8e01ca6f81e1d00a85fb137486d026817015178593c2a5de1dde34f809bc48b1348ea661a94ee0913811d23d0c204d28c29af0c1c9d69bd31eeefd9af85 WHIRLPOOL 74872c9582d4b9c54fad4cec1be6cee4b7cf18f3b8cb92d8b027dfee1ec4a48fdfefddfeda4f2fb5b95e1af291a0c87f4743c4753a4361c408f0b4fe858dcc99
EBUILD darwin-streaming-server-6.0.3.ebuild 4494 SHA256 8654bb6d3c5856f361675663c234bf14eefd26dd2608567038c41c10517a5482 SHA512 88ea5be53b77efe1883263b0223e5d0340dd72dc0d323ef3374ee9e551cf91bf79f67aa1920aaf2bc9bc969b662439142497cd0468be23283e41d5bdf75c9053 WHIRLPOOL c51a8c1108e8aa4fbe0c0f00e615f451c2d7f381a7b8cacc4aca6c4139de79e697eac647f251bb00fc5b52aa83e51037014bbb7a75b2ee6bcfd3d17e83b4c2e5

151
media-video/darwin-streaming-server/darwin-streaming-server-6.0.3.ebuild Normal file
View file

@ -0,0 +1,151 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
# $Header: darwin-streaming-server-6.0.3.ebuild 2008-06-05 bpkroth $
EAPI=2
inherit eutils
MY_P="DarwinStreamingSrvr${PV}-Source"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Darwin Streaming Server allows you to send streaming media across the internet using the industry standard RTP and RTSP protocols."
HOMEPAGE="http://dss.macosforge.org/"
SRC_URI="http://dss.macosforge.org/downloads/${MY_P}.tar"
LICENSE="APSL-2"
[ "${ARCH}" == "amd64" ] && M32="+m32"
SLOT="0"
KEYWORDS="~x86 ~amd64 ~ppc"
IUSE="ssl ${M32}"
DEPEND="virtual/libc"
RDEPEND="${DEPEND}
dev-lang/perl
!media-video/darwin-streaming-server-bin
ssl? ( dev-perl/Net-SSLeay )"
DEPEND="${DEPEND}"
src_unpack() {
unpack ${A}
#Apply the patch to set proper FHS paths
cd ${WORKDIR}
epatch ${FILESDIR}/${P}-gentoo.patch
# A patch to make things build nicely in linux:
# http://dss.macosforge.org/trac/ticket/6
epatch ${FILESDIR}/${P}-linux.patch
# Apply the patch to allow PPC64 w/ 32bit-UL to build as if it were i686.
# http://bugs.gentoo.org/show_bug.cgi?id=84011#c36
# Warning: this is a hack.
if [ "${ARCH}" == "ppc" ] || [ ${ARCH} == "ppc64" ]; then
epatch ${FILESDIR}/${P}-ppc64.patch
fi
# Apply patch to build on x86_64
# http://dss.macosforge.org/trac/ticket/10
if [ "${ARCH}" == "amd64" ]; then
epatch ${FILESDIR}/${P}-x86_64.patch
if use m32; then
epatch ${FILESDIR}/${P}-x86_64-m32.patch
else
ewarn "This package is currently unstable when builing 64-bit code."
ewarn "Please consider setting USE=\"m32\" to force 32-bit code."
ewarn "See: http://dss.macosforge.org/trac/ticket/10"
fi
fi
}
src_compile() {
# run the included build script
./Buildit || die "Darwin build script failed"
}
src_install() {
# NOTE: Apple's custom build scripts makes it a real PITA
# to install to useful and expected locations. Consequently,
# the built binaries and configuration files are to be moved
# manually into their respective directories which correspond to
# the changed locations in the -gentoo.patch.
# binaries go in here
(
into /usr
dosbin DarwinStreamingServer
dobin PlaylistBroadcaster.tproj/PlaylistBroadcaster
dobin MP3Broadcaster/MP3Broadcaster
dobin StreamingLoadTool/StreamingLoadTool
dobin qtpasswd.tproj/qtpasswd
dobin WebAdmin/src/streamingadminserver.pl
dobin StreamingProxy.tproj/StreamingProxy
) || die "failure!"
# streaming server modules go in here
keepdir /usr/lib/dss
# configuration files go in here
dodir /etc/dss
insinto /etc/dss
newins streamingserver.xml-POSIX streamingserver.xml-sample
newins streamingserver.xml-POSIX streamingserver.xml
doins relayconfig.xml-Sample
doins StreamingLoadTool/streamingloadtool.conf
doins qtusers
doins qtgroups
doins qtaccess
fowners root:nobody /etc/dss/qtusers
fowners root:nobody /etc/dss/qtgroups
fperms 0640 /etc/dss/qtusers
fperms 0640 /etc/dss/qtgroups
doins WebAdmin/streamingadminserver.conf
doins StreamingProxy.tproj/streamingproxy.conf
newins WebAdmin/streamingadminserver.pem streamingadminserver.pem-sample
# server rc scripts go in here
insinto /etc/init.d
newins ${FILESDIR}/dss.rc dss
newins ${FILESDIR}/dss-admin.rc dss-admin
fperms +x /etc/init.d/dss
fperms +x /etc/init.d/dss-admin
# log files are generated in here
keepdir /var/log/dss
fowners nobody:nobody /var/log/dss
# admin web application goes in here
dodir /var/lib/dss/admin
cp -ax WebAdmin/WebAdminHtml/* ${D}/var/lib/dss/admin
dodir /var/lib/dss/media
cp -ax sample* ${D}/var/lib/dss/media
keepdir /var/lib/dss/media/http
keepdir /var/lib/dss/media/playlists
fowners nobody:nobody /var/lib/dss/media/playlists
#Documentation goes in here
dodoc ReleaseNotes.txt
dodoc StreamingProxy.tproj/StreamingProxy.html
}
# -gentoo.patch sets up the run_as creds as nobody:nobody
# there's no need to create this user.
#pkg_setup() {
# einfo "creating qtss group and user"
# enewgroup qtss
# enewuser qtss -1 /dev/null /bin/false "qtss"
#}
pkg_postinst() {
# alert user that they need to create an user in the admin group
# before starting up the server.
einfo "If you intend on using the web-based admin interface you"
einfo "need to run 'qtpasswd -A admin <username>' before"
einfo "starting up the admin server. If you do not plan on"
einfo "using the admin interface you can just start the Darwin"
einfo "Streaming Server."
}

289
media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-gentoo.patch Normal file
View file

@ -0,0 +1,289 @@
diff -Nur DarwinStreamingSrvr6.0.3-Source/defaultPaths.h DarwinStreamingSrvr6.0.3-Source.gentoo/defaultPaths.h
--- DarwinStreamingSrvr6.0.3-Source/defaultPaths.h 2008-05-05 18:29:00.000000000 -0500
+++ DarwinStreamingSrvr6.0.3-Source.gentoo/defaultPaths.h 2008-06-05 12:07:33.000000000 -0500
@@ -58,11 +58,11 @@
# define DEFAULTPATHS_DIRECTORY_SEPARATOR "/"
-# define DEFAULTPATHS_ETC_DIR "/etc/streaming/"
+# define DEFAULTPATHS_ETC_DIR "/etc/dss/"
# define DEFAULTPATHS_ETC_DIR_OLD "/etc/"
-# define DEFAULTPATHS_SSM_DIR "/usr/local/sbin/StreamingServerModules/"
-# define DEFAULTPATHS_LOG_DIR "/var/streaming/logs/"
-# define DEFAULTPATHS_MOVIES_DIR "/usr/local/movies/"
+# define DEFAULTPATHS_SSM_DIR "/usr/lib/dss/"
+# define DEFAULTPATHS_LOG_DIR "/var/log/dss/"
+# define DEFAULTPATHS_MOVIES_DIR "/var/lib/dss/media/"
# define DEFAULTPATHS_PID_DIR "/var/run/"
#endif
diff -Nur DarwinStreamingSrvr6.0.3-Source/qtaccess DarwinStreamingSrvr6.0.3-Source.gentoo/qtaccess
--- DarwinStreamingSrvr6.0.3-Source/qtaccess 2007-11-15 23:17:59.000000000 -0600
+++ DarwinStreamingSrvr6.0.3-Source.gentoo/qtaccess 2008-06-05 12:08:33.000000000 -0500
@@ -26,7 +26,7 @@
# If not given, the default filename is /etc/streaming/qtusers for POSIX
# usage: AuthUserFile <user filename>
#AuthUserFile /etc/streaming/qtusers
-AuthUserFile /Library/QuickTimeStreaming/Config/qtusers
+AuthUserFile /etc/dss/qtusers
# AuthGroupFile: The filename that contains the groups and the
# users that belong to each group
@@ -34,7 +34,7 @@
# If not given, the default filename is /etc/streaming/qtgroups for POSIX
# usage: AuthGroupFile <group filename>
#AuthGroupFile /etc/streaming/qtgroups
-AuthGroupFile /Library/QuickTimeStreaming/Config/qtgroups
+AuthGroupFile /etc/dss/qtgroups
# require user: The names next to this specify which user
# is allowed to access the media in this folder
@@ -60,8 +60,8 @@
# usage: <Limit [READ|WRITE] ..> ... </Limit>
<Limit WRITE>
AuthName "streaming server broadcaster realm"
- AuthUserFile /Library/QuickTimeStreaming/Config/qtbroadcastusers
- AuthGroupFile /Library/QuickTimeStreaming/Config/qtbroadcastgroups
+ AuthUserFile /etc/dss/qtbroadcastusers
+ AuthGroupFile /etc/dss/qtbroadcastgroups
require group broadcaster
</Limit>
diff -Nur DarwinStreamingSrvr6.0.3-Source/qtgroups DarwinStreamingSrvr6.0.3-Source.gentoo/qtgroups
--- DarwinStreamingSrvr6.0.3-Source/qtgroups 2007-11-15 23:18:00.000000000 -0600
+++ DarwinStreamingSrvr6.0.3-Source.gentoo/qtgroups 2008-06-05 12:08:51.000000000 -0500
@@ -1 +1 @@
-admin: aGFja21l
+admin:
diff -Nur DarwinStreamingSrvr6.0.3-Source/qtusers DarwinStreamingSrvr6.0.3-Source.gentoo/qtusers
--- DarwinStreamingSrvr6.0.3-Source/qtusers 2007-11-15 23:18:07.000000000 -0600
+++ DarwinStreamingSrvr6.0.3-Source.gentoo/qtusers 2008-06-05 12:09:08.000000000 -0500
@@ -1,2 +1 @@
realm Streaming Server
-aGFja21l:0muym.z3yrHSw:fa000739887bb2871bcf0c9201b5ebd5
diff -Nur DarwinStreamingSrvr6.0.3-Source/Server.tproj/QTSServerPrefs.cpp DarwinStreamingSrvr6.0.3-Source.gentoo/Server.tproj/QTSServerPrefs.cpp
--- DarwinStreamingSrvr6.0.3-Source/Server.tproj/QTSServerPrefs.cpp 2008-05-05 18:28:59.000000000 -0500
+++ DarwinStreamingSrvr6.0.3-Source.gentoo/Server.tproj/QTSServerPrefs.cpp 2008-06-05 13:06:11.000000000 -0500
@@ -124,8 +124,8 @@
{ kDontAllowMultipleValues, "false", NULL }, //do_report_http_connection_ip_address
{ kDontAllowMultipleValues, "Streaming Server", NULL }, //default_authorization_realm
#ifndef __Win32__
- { kDontAllowMultipleValues, "qtss", NULL }, //run_user_name
- { kDontAllowMultipleValues, "qtss", NULL }, //run_group_name
+ { kDontAllowMultipleValues, "nobody", NULL }, //run_user_name
+ { kDontAllowMultipleValues, "nobody", NULL }, //run_group_name
#else
{ kDontAllowMultipleValues, "", NULL }, //run_user_name
{ kDontAllowMultipleValues, "", NULL }, //run_group_name
diff -Nur DarwinStreamingSrvr6.0.3-Source/streamingserver.xml-POSIX DarwinStreamingSrvr6.0.3-Source.gentoo/streamingserver.xml-POSIX
--- DarwinStreamingSrvr6.0.3-Source/streamingserver.xml-POSIX 2008-03-25 19:42:51.000000000 -0500
+++ DarwinStreamingSrvr6.0.3-Source.gentoo/streamingserver.xml-POSIX 2008-06-05 12:14:50.000000000 -0500
@@ -1,5 +1,5 @@
<?xml version ="1.0"?>
-<!-- This is a sample /etc/streaming/streamingserver.xml file -->
+<!-- This is a sample /etc/dss/streamingserver.xml file -->
<!-- The Document Type Definition (DTD) for the file -->
<!DOCTYPE CONFIGURATION [
<!ELEMENT CONFIGURATION (SERVER, MODULE*)>
@@ -79,7 +79,7 @@
<PREF NAME="error_logfile_interval" TYPE="UInt32">7</PREF>
<!-- error log. A value of 0 means unlimited. -->
- <PREF NAME="error_logfile_dir">/var/streaming/logs</PREF>
+ <PREF NAME="error_logfile_dir">/var/log/dss</PREF>
<!-- Name of the error log file. -->
<PREF NAME="error_logfile_name">Error</PREF>
@@ -88,7 +88,7 @@
<PREF NAME="pid_file">/var/run/DarwinStreamingServer.pid</PREF>
<!-- Path to the folder containing dynamic loadable server modules -->
- <PREF NAME="module_folder">/usr/local/sbin/StreamingServerModules</PREF>
+ <PREF NAME="module_folder">/usr/lib/dss</PREF>
<!-- If this is true, the server will allow streaming of files that have invalid hint track references -->
<PREF NAME="allow_invalid_hint_track_refs" TYPE="Bool16">false</PREF>
@@ -121,7 +121,7 @@
<PREF NAME="bind_ip_addr">0</PREF>
<!-- Path to the root folder for movies. -->
- <PREF NAME="movie_folder">/usr/local/movies</PREF>
+ <PREF NAME="movie_folder">/var/lib/dss/media</PREF>
<!-- Maximum amount of bandwidth the server is allowed to serve. -->
<!-- value is in kilobits/sec. While this limit is exceeded, new client requests. -->
@@ -145,10 +145,10 @@
<PREF NAME="rtsp_timeout" TYPE="UInt32">0</PREF>
<!-- Run as this user -->
- <PREF NAME="run_user_name"></PREF>
+ <PREF NAME="run_user_name">nobody</PREF>
<!-- Member of this group -->
- <PREF NAME="run_group_name"></PREF>
+ <PREF NAME="run_group_name">nobody</PREF>
<!-- The following 8 prefs implement the server's thinning algorithm. -->
<!-- They are all in milliseconds -->
@@ -297,10 +297,10 @@
<PREF NAME="request_logfile_size" TYPE="UInt32">10240000</PREF>
<!-- Path to directory where access logs are stored. -->
- <PREF NAME="request_logfile_dir">/var/streaming/logs</PREF>
+ <PREF NAME="request_logfile_dir">/var/log/dss</PREF>
<!-- Name of the access log file. -->
- <PREF NAME="request_logfile_name">StreamingServer</PREF>
+ <PREF NAME="request_logfile_name">dss</PREF>
<!-- Either "true" or "false". Logs date time field -->
<!-- in GMT if true and in localtime if false-->
@@ -371,7 +371,7 @@
<PREF NAME="mp3_request_logfile_name" >mp3_access</PREF>
<!-- Path to directory where access logs are stored. -->
- <PREF NAME="mp3_request_logfile_dir">/var/streaming/logs</PREF>
+ <PREF NAME="mp3_request_logfile_dir">/var/log/dss</PREF>
<!-- Either "true" or "false". This toggles -->
<!-- mp3 access logging on and off. -->
@@ -403,14 +403,14 @@
<PREF NAME="http_xfer_enabled" TYPE="Bool16" >false</PREF>
<!-- Path to the http download folder. All files -->
<!-- that are requested from this folder are sent via HTTP -->
- <PREF NAME="http_folder">/usr/local/movies/http</PREF>
+ <PREF NAME="http_folder">/var/lib/dss/media/http</PREF>
<!-- Either "true" or "false". This toggles http module -->
<!-- logging on and off. -->
<PREF NAME="http_logging" TYPE="Bool16">true</PREF>
<!-- Name of the http module log file. -->
<PREF NAME="http_logfile_name">Http</PREF>
<!-- Path to directory where http module logs are stored. -->
- <PREF NAME="http_logfile_dir">/var/streaming/logs</PREF>
+ <PREF NAME="http_logfile_dir">/var/log/dss</PREF>
<!-- Maximum allowed size in bytes for the http module log. A -->
<!-- value of 0 means unlimited. -->
<PREF NAME="http_logfile_size" TYPE="UInt32">256000</PREF>
@@ -525,7 +525,7 @@
<MODULE NAME="QTSSRelayModule">
<!-- Relay preferences file. This file should be in the documented .rcf (Relay config file) -->
<!-- format. The Relay will use this to load up all relay streams -->
- <PREF NAME="relay_prefs_file">/etc/streaming/relayconfig.xml</PREF>
+ <PREF NAME="relay_prefs_file">/etc/dss/relayconfig.xml</PREF>
<!-- enter this URL into a web browser and get a web page with current stats on -->
<!-- your active relays -->
@@ -537,10 +537,10 @@
<PREF NAME="modAccess_qtaccessfilename">qtaccess</PREF>
<!-- The default path and file name for the AccessModule's groups list -->
- <PREF NAME="modAccess_groupsfilepath">/etc/streaming/qtgroups</PREF>
+ <PREF NAME="modAccess_groupsfilepath">/etc/dss/qtgroups</PREF>
<!-- The default path and file name for the AccessModule's user list -->
- <PREF NAME="modAccess_usersfilepath">/etc/streaming/qtusers</PREF>
+ <PREF NAME="modAccess_usersfilepath">/etc/dss/qtusers</PREF>
</MODULE>
<MODULE NAME="QTSSAdminModule">
diff -Nur DarwinStreamingSrvr6.0.3-Source/WebAdmin/src/streamingadminserver.pl DarwinStreamingSrvr6.0.3-Source.gentoo/WebAdmin/src/streamingadminserver.pl
--- DarwinStreamingSrvr6.0.3-Source/WebAdmin/src/streamingadminserver.pl 2008-05-05 18:28:57.000000000 -0500
+++ DarwinStreamingSrvr6.0.3-Source.gentoo/WebAdmin/src/streamingadminserver.pl 2008-06-05 12:03:43.000000000 -0500
@@ -78,7 +78,7 @@
$defaultConfigPath = "/Library/QuickTimeStreaming/Config/streamingadminserver.conf";
}
else {
- $defaultConfigPath = "/etc/streaming/streamingadminserver.conf";
+ $defaultConfigPath = "/etc/dss/streamingadminserver.conf";
}
$debug = 0;
@@ -229,8 +229,8 @@
else {
%vital = ("port", 1220,
"sslport", 1240,
- "root", "/var/streaming/AdminHtml",
- "plroot", "/var/streaming/playlists/",
+ "root", "/var/lib/dss/admin",
+ "plroot", "/var/lib/dss/media/playlists/",
"server", "DSS 6.0 Admin Server/1.0",
"index_docs", "index.html parse_xml.cgi index.htm index.cgi",
"addtype_html", "text/html",
@@ -245,28 +245,28 @@
"realm", "DSS Admin Server",
"qtssIPAddress", "localhost",
"qtssPort", "554",
- "qtssName", "/usr/local/sbin/DarwinStreamingServer",
+ "qtssName", "/usr/sbin/DarwinStreamingServer",
"qtssAutoStart", "1",
- "logfile", "/var/streaming/logs/streamingadminserver.log",
+ "logfile", "/var/log/dss/streamingadminserver.log",
"log", "1",
"logclear", "0",
"logtime", "168",
"messagesfile", "messages",
"gbrowse", "0",
"ssl", "0",
- "crtfile", "/etc/streaming/streamingadminserver.pem",
- "keyfile", "/etc/streaming/streamingadminserver.pem",
+ "crtfile", "/etc/dss/streamingadminserver.pem",
+ "keyfile", "/etc/dss/streamingadminserver.pem",
#"keypasswordfile", "",
- "qtssQTPasswd", "/usr/local/bin/qtpasswd",
- "qtssPlaylistBroadcaster", "/usr/local/bin/PlaylistBroadcaster",
- "qtssMP3Broadcaster", "/usr/local/bin/MP3Broadcaster",
+ "qtssQTPasswd", "/usr/bin/qtpasswd",
+ "qtssPlaylistBroadcaster", "/usr/bin/PlaylistBroadcaster",
+ "qtssMP3Broadcaster", "/usr/bin/MP3Broadcaster",
"helpurl", "http://helpqt.apple.com/dssWebAdminHelpR3/dssWebAdmin.help/DSSHelp.htm",
"tempfileloc", "/tmp",
"qtssAdmin", "streamingadmin",
"cacheMessageFiles", "0",
"pidfile", "/var/run/streamingadminserver.pid",
- "runUser", "qtss",
- "runGroup", "qtss",
+ "runUser", "nobody",
+ "runGroup", "nobody",
"cookieExpireSeconds", "600"
);
}
diff -Nur DarwinStreamingSrvr6.0.3-Source/WebAdmin/streamingadminserver.conf DarwinStreamingSrvr6.0.3-Source.gentoo/WebAdmin/streamingadminserver.conf
--- DarwinStreamingSrvr6.0.3-Source/WebAdmin/streamingadminserver.conf 2007-11-15 23:16:39.000000000 -0600
+++ DarwinStreamingSrvr6.0.3-Source.gentoo/WebAdmin/streamingadminserver.conf 2008-06-05 12:06:26.000000000 -0500
@@ -6,11 +6,11 @@
# The root directory for all the html and cgi files
# The path should be absolute
-root=/Library/QuickTimeStreaming/AdminHtml
+root=/var/lib/dss/admin
# The root directory for play lists managed by the adminserver
# The path should be absolute
-plroot=/Library/QuickTimeStreaming/Playlists
+plroot=/var/lib/dss/media/playlists
# The host name of the streaming admin server
host=foo.bar.com
@@ -22,11 +22,11 @@
qtssPort=554
# The name of the streaming server binary
-qtssName=/usr/sbin/QuickTimeStreamingServer
+qtssName=/usr/sbin/DarwinStreamingServer
# If set to 1, admin server will start qtss when it is launched
# If set to 0, qtss will not be launched when the admin starts up
-qtssAutoStart=1
+qtssAutoStart=0
# To add new mime types
# If the suffix is xxx, and the
@@ -41,7 +41,7 @@
log=1
# The full path of the streaming admin server log file
-logfile=/Library/QuickTimeStreaming/Logs/streamingadminserver.log
+logfile=/var/log/dss/streamingadminserver.log
# Number of hours before which logs are rolled
logtime=168

381
media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-linux.patch Normal file
View file

@ -0,0 +1,381 @@
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/APICommonCode/QTAccessFile.cpp DarwinStreamingSrvr6.0.3-Source/APICommonCode/QTAccessFile.cpp
--- DarwinStreamingSrvr6.0.3-Source.orig/APICommonCode/QTAccessFile.cpp 2008-05-06 01:28:57.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/APICommonCode/QTAccessFile.cpp 2008-05-24 03:23:13.000000000 +0200
@@ -46,7 +46,9 @@
#include <grp.h>
+#ifdef __MacOSX__
#include <membership.h>
+#endif
#include <pwd.h>
#include <signal.h>
#include <unistd.h>
@@ -613,6 +615,7 @@
bool DSAccessFile::CheckGroupMembership(const char* inUsername, const char* inGroupName)
{
+#ifdef __MacOSX__
// In Tiger, group membership is painfully simple: we ask memberd for it!
struct passwd *user = NULL;
struct group *group = NULL;
@@ -641,6 +644,9 @@
if ( mbr_check_membership(userID, groupID, &isMember) )
return false;
return (bool)isMember;
+#else
+ return true;
+#endif
}
Bool16 DSAccessFile::ValidUser( char*userName, void* extraDataPtr)
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/CommonUtilitiesLib/OSHeaders.h DarwinStreamingSrvr6.0.3-Source/CommonUtilitiesLib/OSHeaders.h
--- DarwinStreamingSrvr6.0.3-Source.orig/CommonUtilitiesLib/OSHeaders.h 2008-05-06 01:28:59.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/CommonUtilitiesLib/OSHeaders.h 2008-05-24 02:05:15.000000000 +0200
@@ -120,7 +120,6 @@
#elif __linux__ || __linuxppc__ || __FreeBSD__
-
/* Defines */
#define _64BITARG_ "q"
#define _S64BITARG_ "lld"
@@ -128,9 +127,13 @@
#if __LP64__
#define _S32BITARG_ "d"
#define _U32BITARG_ "u"
+ #define _SPOINTERSIZEARG_ _S64BITARG_
+ #define _UPOINTERSIZEARG_ _U64BITARG_
#else
- #define _S32BITARG_ "ld"
- #define _U32BITARG_ "lu"
+ #define _S32BITARG_ "d"
+ #define _U32BITARG_ "u"
+ #define _SPOINTERSIZEARG_ _S32BITARG_
+ #define _UPOINTERSIZEARG_ _U32BITARG_
#endif
/* paths */
@@ -141,6 +144,7 @@
/* Includes */
#include <sys/types.h>
+ #include <stdint.h>
/* Constants */
#define QT_TIME_TO_LOCAL_TIME (-2082844800)
@@ -149,14 +153,14 @@
/* Typedefs */
typedef signed long PointerSizedInt;
typedef unsigned long PointerSizedUInt;
- typedef unsigned char UInt8;
- typedef signed char SInt8;
- typedef unsigned short UInt16;
- typedef signed short SInt16;
- typedef unsigned int UInt32;
- typedef signed int SInt32;
- typedef signed int int SInt64;
- typedef unsigned int int UInt64;
+ typedef uint8_t UInt8;
+ typedef int8_t SInt8;
+ typedef uint16_t UInt16;
+ typedef int16_t SInt16;
+ typedef uint32_t UInt32;
+ typedef int32_t SInt32;
+ typedef int64_t SInt64;
+ typedef uint64_t UInt64;
typedef float Float32;
typedef double Float64;
typedef UInt16 Bool16;
@@ -177,11 +181,14 @@
#define TW0_CHARS_TO_INT( c1, c2 ) ( c1 << 8 | c2 )
+ #define kSInt16_Max USHRT_MAX
+ #define kUInt16_Max USHRT_MAX
+ #define kSInt32_Max LONG_MAX
+ #define kUInt32_Max ULONG_MAX
-
-
-
+ #define kSInt64_Max LONG_LONG_MAX
+ #define kUInt64_Max ULONG_LONG_MAX
#elif __Win32__
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/CommonUtilitiesLib/OSRef.h DarwinStreamingSrvr6.0.3-Source/CommonUtilitiesLib/OSRef.h
--- DarwinStreamingSrvr6.0.3-Source.orig/CommonUtilitiesLib/OSRef.h 2008-05-06 01:28:59.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/CommonUtilitiesLib/OSRef.h 2008-05-23 22:28:51.000000000 +0200
@@ -45,6 +45,7 @@
#include "StrPtrLen.h"
#include "OSHashTable.h"
#include "OSCond.h"
+#include "OSHeaders.h"
class OSRefKey;
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/Makefile.POSIX DarwinStreamingSrvr6.0.3-Source/Makefile.POSIX
--- DarwinStreamingSrvr6.0.3-Source.orig/Makefile.POSIX 2007-11-16 06:17:59.000000000 +0100
+++ DarwinStreamingSrvr6.0.3-Source/Makefile.POSIX 2008-05-24 07:19:34.000000000 +0200
@@ -42,7 +42,6 @@
CCFLAGS += -IRTPMetaInfoLib
CCFLAGS += -IPrefsSourceLib
CCFLAGS += -IServer.tproj
-
# EACH DIRECTORY WITH A STATIC LIBRARY MUST BE APPENDED IN THIS MANNER TO THE LINKOPTS
LINKOPTS = -LCommonUtilitiesLib
@@ -52,38 +51,42 @@
CFILES = CommonUtilitiesLib/daemon.c
-CPPFILES = Server.tproj/QTSSExpirationDate.cpp\
+CPPFILES = Server.tproj/GenerateXMLPrefs.cpp \
+ Server.tproj/main.cpp \
Server.tproj/QTSSCallbacks.cpp \
- Server.tproj/QTSSDictionary.cpp\
Server.tproj/QTSSDataConverter.cpp \
+ Server.tproj/QTSSDictionary.cpp \
Server.tproj/QTSSErrorLogModule.cpp \
- Server.tproj/QTSSMessages.cpp\
+ Server.tproj/QTSServer.cpp \
+ Server.tproj/QTSServerInterface.cpp \
+ Server.tproj/QTSServerPrefs.cpp \
+ Server.tproj/QTSSExpirationDate.cpp \
+ Server.tproj/QTSSFile.cpp \
+ Server.tproj/QTSSMessages.cpp \
Server.tproj/QTSSModule.cpp \
- Server.tproj/QTSServerPrefs.cpp\
- Server.tproj/QTSSSocket.cpp\
- Server.tproj/QTSSFile.cpp\
Server.tproj/QTSSPrefs.cpp \
- Server.tproj/QTSServer.cpp\
- Server.tproj/QTSServerInterface.cpp \
- Server.tproj/RTCPTask.cpp\
- Server.tproj/RTPSession.cpp \
- Server.tproj/RTPPacketResender.cpp \
+ Server.tproj/QTSSSocket.cpp \
+ Server.tproj/QTSSUserProfile.cpp \
+ Server.tproj/RTCPTask.cpp \
Server.tproj/RTPBandwidthTracker.cpp \
Server.tproj/RTPOverbufferWindow.cpp \
- Server.tproj/RTPSessionInterface.cpp\
+ Server.tproj/RTPPacketResender.cpp \
+ Server.tproj/RTPSession3GPP.cpp \
+ Server.tproj/RTPSession.cpp \
+ Server.tproj/RTPSessionInterface.cpp \
+ Server.tproj/RTPStream3gpp.cpp \
Server.tproj/RTPStream.cpp \
- Server.tproj/RTSPProtocol.cpp\
+ Server.tproj/RTSPProtocol.cpp \
+ Server.tproj/RTSPRequest3GPP.cpp \
Server.tproj/RTSPRequest.cpp \
- Server.tproj/RTSPRequestInterface.cpp\
+ Server.tproj/RTSPRequestInterface.cpp \
Server.tproj/RTSPRequestStream.cpp \
- Server.tproj/RTSPResponseStream.cpp\
+ Server.tproj/RTSPResponseStream.cpp \
+ Server.tproj/RTSPSession3GPP.cpp \
Server.tproj/RTSPSession.cpp \
- Server.tproj/RTSPSessionInterface.cpp\
- Server.tproj/main.cpp \
+ Server.tproj/RTSPSessionInterface.cpp \
Server.tproj/RunServer.cpp \
- Server.tproj/GenerateXMLPrefs.cpp \
- Server.tproj/QTSSUserProfile.cpp\
- PrefsSourceLib/FilePrefsSource.cpp\
+ PrefsSourceLib/FilePrefsSource.cpp \
PrefsSourceLib/XMLPrefsParser.cpp \
PrefsSourceLib/XMLParser.cpp \
OSMemoryLib/OSMemory.cpp \
@@ -91,17 +94,20 @@
RTSPClientLib/ClientSocket.cpp \
HTTPUtilitiesLib/HTTPProtocol.cpp \
HTTPUtilitiesLib/HTTPRequest.cpp \
- RTCPUtilitiesLib/RTCPAPPPacket.cpp\
+ RTCPUtilitiesLib/RTCPAckPacket.cpp \
+ RTCPUtilitiesLib/RTCPAPPNADUPacket.cpp \
+ RTCPUtilitiesLib/RTCPAPPPacket.cpp \
+ RTCPUtilitiesLib/RTCPAPPQTSSPacket.cpp \
RTCPUtilitiesLib/RTCPPacket.cpp \
- RTCPUtilitiesLib/RTCPSRPacket.cpp\
- RTCPUtilitiesLib/RTCPAckPacket.cpp\
- RTPMetaInfoLib/RTPMetaInfoPacket.cpp\
+ RTCPUtilitiesLib/RTCPSRPacket.cpp \
+ RTPMetaInfoLib/RTPMetaInfoPacket.cpp \
APIStubLib/QTSS_Private.cpp \
APICommonCode/QTSSModuleUtils.cpp\
APICommonCode/QTSSRollingLog.cpp \
APICommonCode/SDPSourceInfo.cpp \
APICommonCode/SourceInfo.cpp \
APICommonCode/QTAccessFile.cpp \
+ APICommonCode/QTSS3GPPModuleUtils.cpp \
SafeStdLib/InternalStdLib.cpp \
APIModules/QTSSAccessLogModule/QTSSAccessLogModule.cpp \
APIModules/QTSSFileModule/QTSSFileModule.cpp \
@@ -129,7 +135,7 @@
APIModules/QTSSAccessModule/QTSSAccessModule.cpp \
APIModules/QTSSHttpFileModule/QTSSHttpFileModule.cpp \
APIModules/QTSSAccessModule/AccessChecker.cpp
-
+
# CCFLAGS += $(foreach dir,$(HDRS),-I$(dir))
LIBFILES = QTFileLib/libQTFileLib.a \
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/RTSPClientLib/PlayerSimulator.h DarwinStreamingSrvr6.0.3-Source/RTSPClientLib/PlayerSimulator.h
--- DarwinStreamingSrvr6.0.3-Source.orig/RTSPClientLib/PlayerSimulator.h 2008-05-06 01:29:00.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/RTSPClientLib/PlayerSimulator.h 2008-05-24 02:08:45.000000000 +0200
@@ -31,7 +31,7 @@
#ifndef _PLAYERSIMULATOR_H_
#define _PLAYERSIMULATOR_H_
-#include "SafeStdLib.h""
+#include "SafeStdLib.h"
#include "OSHeaders.h"
#include "OS.h"
#include "SVector.h"
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/QTSSErrorLogModule.cpp DarwinStreamingSrvr6.0.3-Source/Server.tproj/QTSSErrorLogModule.cpp
--- DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/QTSSErrorLogModule.cpp 2008-05-06 01:28:59.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/Server.tproj/QTSSErrorLogModule.cpp 2008-05-24 02:58:48.000000000 +0200
@@ -265,7 +265,11 @@
sDupErrorStringCount = 0;
}
- ::strlcpy(sLastErrorString, inParamBlock->errorParams.inBuffer, sizeof(sLastErrorString));
+#if __MacOSX__
+ strlcpy(sLastErrorString, inParamBlock->errorParams.inBuffer, sizeof(sLastErrorString));
+#else
+ strncpy(sLastErrorString, inParamBlock->errorParams.inBuffer, sizeof(sLastErrorString) -1);
+#endif
}
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/QTSServer.cpp DarwinStreamingSrvr6.0.3-Source/Server.tproj/QTSServer.cpp
--- DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/QTSServer.cpp 2008-05-06 01:28:59.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/Server.tproj/QTSServer.cpp 2008-05-24 07:24:39.000000000 +0200
@@ -70,7 +70,9 @@
#include "QTSSAdminModule.h"
#include "QTSSAccessModule.h"
#include "QTSSMP3StreamingModule.h"
+#if __MacOSX__
#include "QTSSDSAuthModule.h"
+#endif
#if MEMORY_DEBUGGING
#include "QTSSWebDebugModule.h"
#endif
@@ -85,7 +87,7 @@
#include "RTCPTask.h"
#include "QTSSFile.h"
-#include "RTPStream3GPP.h"
+#include "RTPStream3gpp.h"
#include "RTSPRequest3GPP.h"
// CLASS DEFINITIONS
@@ -680,9 +682,11 @@
(void)AddModule(theWebDebug);
#endif
+#if __MacOSX__
QTSSModule* theQTSSDSAuthModule = new QTSSModule("QTSSDSAuthModule");
(void)theQTSSDSAuthModule->SetupModule(&sCallbacks, &QTSSDSAuthModule_Main);
(void)AddModule(theQTSSDSAuthModule);
+#endif
QTSSModule* theQTACCESSmodule = new QTSSModule("QTSSAccessModule");
(void)theQTACCESSmodule->SetupModule(&sCallbacks, &QTSSAccessModule_Main);
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/RTPSession.cpp DarwinStreamingSrvr6.0.3-Source/Server.tproj/RTPSession.cpp
--- DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/RTPSession.cpp 2008-05-06 01:28:59.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/Server.tproj/RTPSession.cpp 2008-05-24 02:39:34.000000000 +0200
@@ -38,7 +38,7 @@
#include "RTSPProtocol.h"
#include "QTSServerInterface.h"
#include "QTSS.h"
-#include "RTSPRequest3gpp.h"
+#include "RTSPRequest3GPP.h"
#include "OS.h"
#include "OSMemory.h"
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/RTPStream3gpp.cpp DarwinStreamingSrvr6.0.3-Source/Server.tproj/RTPStream3gpp.cpp
--- DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/RTPStream3gpp.cpp 2008-05-06 01:28:59.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/Server.tproj/RTPStream3gpp.cpp 2008-05-24 02:48:52.000000000 +0200
@@ -34,7 +34,7 @@
#include "RTPStream.h"
#include "RTPStream3gpp.h"
#include "RTPSessionInterface.h"
-#include "RTSPRequest3gpp.h"
+#include "RTSPRequest3GPP.h"
#include "RTCPAPPNADUPacket.h"
#if DEBUG
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/RTPStream.h DarwinStreamingSrvr6.0.3-Source/Server.tproj/RTPStream.h
--- DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/RTPStream.h 2008-05-06 01:28:59.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/Server.tproj/RTPStream.h 2008-05-24 02:36:24.000000000 +0200
@@ -57,7 +57,7 @@
#include "RTCPPacket.h"
-#include "RTSPRequest3gpp.h"
+#include "RTSPRequest3GPP.h"
#ifndef MIN
#define MIN(a,b) (((a)<(b))?(a):(b))
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/RTSPRequest3GPP.cpp DarwinStreamingSrvr6.0.3-Source/Server.tproj/RTSPRequest3GPP.cpp
--- DarwinStreamingSrvr6.0.3-Source.orig/Server.tproj/RTSPRequest3GPP.cpp 2008-05-06 01:28:59.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/Server.tproj/RTSPRequest3GPP.cpp 2008-05-24 02:49:26.000000000 +0200
@@ -32,7 +32,7 @@
*/
-#include "RTSPRequest3gpp.h"
+#include "RTSPRequest3GPP.h"
#include "RTSPProtocol.h"
#include "QTSServerInterface.h"
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/StreamingLoadTool/Makefile.POSIX DarwinStreamingSrvr6.0.3-Source/StreamingLoadTool/Makefile.POSIX
--- DarwinStreamingSrvr6.0.3-Source.orig/StreamingLoadTool/Makefile.POSIX 2007-11-16 06:17:36.000000000 +0100
+++ DarwinStreamingSrvr6.0.3-Source/StreamingLoadTool/Makefile.POSIX 2008-05-24 02:32:03.000000000 +0200
@@ -17,6 +17,7 @@
CCFLAGS += -I..
CCFLAGS += -I../OSMemoryLib
CCFLAGS += -I../RTSPClientLib
+CCFLAGS += -I../RTCPUtilitiesLib
CCFLAGS += -I../APICommonCode
CCFLAGS += -I../CommonUtilitiesLib
CCFLAGS += -I../PrefsSourceLib
@@ -36,6 +37,12 @@
../RTSPClientLib/ClientSocket.cpp \
../RTSPClientLib/RTSPClient.cpp \
../RTSPClientLib/ClientSession.cpp \
+ ../RTCPUtilitiesLib/RTCPAckPacket.cpp \
+ ../RTCPUtilitiesLib/RTCPAPPNADUPacket.cpp \
+ ../RTCPUtilitiesLib/RTCPAPPPacket.cpp \
+ ../RTCPUtilitiesLib/RTCPAPPQTSSPacket.cpp \
+ ../RTCPUtilitiesLib/RTCPPacket.cpp \
+ ../RTCPUtilitiesLib/RTCPSRPacket.cpp \
../PrefsSourceLib/FilePrefsSource.cpp \
../APICommonCode/SDPSourceInfo.cpp \
../APICommonCode/SourceInfo.cpp \
diff -ur --exclude='*~' DarwinStreamingSrvr6.0.3-Source.orig/StreamingLoadTool/StreamingLoadTool.cpp DarwinStreamingSrvr6.0.3-Source/StreamingLoadTool/StreamingLoadTool.cpp
--- DarwinStreamingSrvr6.0.3-Source.orig/StreamingLoadTool/StreamingLoadTool.cpp 2008-05-06 01:28:57.000000000 +0200
+++ DarwinStreamingSrvr6.0.3-Source/StreamingLoadTool/StreamingLoadTool.cpp 2008-05-24 02:22:13.000000000 +0200
@@ -743,7 +743,7 @@
bitsReceived += .5;
- printf("%5lu %6lu %8lu %6lu %6lu %6lu %9.0fk\n",
+ printf("%5"_U32BITARG_" %6"_U32BITARG_" %8"_U32BITARG_" %6"_U32BITARG_" %6"_U32BITARG_" %6"_U32BITARG_" %9.0fk\n",
ClientSession:: GetActiveConnections (),
ClientSession:: GetPlayingConnections (),
ClientSession:: GetConnectionAttempts (),
@@ -811,7 +811,7 @@
if (sLog != NULL)
::fclose(sLog);
- printf("%5lu %6lu %8lu %6lu %6lu %6lu %9.0fk\n",
+ printf("%5"_U32BITARG_" %6"_U32BITARG_" %8"_U32BITARG_" %6"_U32BITARG_" %6"_U32BITARG_" %6"_U32BITARG_" %9.0fk\n",
ClientSession:: GetActiveConnections (),
ClientSession:: GetPlayingConnections (),
ClientSession:: GetConnectionAttempts (),

52
media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-ppc64.patch Normal file
View file

@ -0,0 +1,52 @@
diff -Naur DarwinStreamingSrvr6.0.3-Source/APIStubLib/BuildAPIStubLib DarwinStreamingSrvr6.0.3-Source.patched/APIStubLib/BuildAPIStubLib
--- DarwinStreamingSrvr6.0.3-Source/APIStubLib/BuildAPIStubLib 2002-09-09 19:58:14.000000000 -0500
+++ DarwinStreamingSrvr6.0.3-Source.patched/APIStubLib/BuildAPIStubLib 2007-07-16 09:02:31.000000000 -0500
@@ -2,6 +2,9 @@
x=`uname`
y=`uname -m`
+if [ "$y" == "ppc64" ]; then
+ y="i686"
+fi
PLAT=$x.$y
diff -Naur DarwinStreamingSrvr6.0.3-Source/Buildit DarwinStreamingSrvr6.0.3-Source.patched/Buildit
--- DarwinStreamingSrvr6.0.3-Source/Buildit 2006-07-14 04:36:35.000000000 -0500
+++ DarwinStreamingSrvr6.0.3-Source.patched/Buildit 2007-07-16 09:03:07.000000000 -0500
@@ -55,6 +55,9 @@
OSNAME=`uname`
HARDWARENAME=`uname -m`
+if [ "$HARDWARENAME" == "ppc64" ]; then
+ HARDWARENAME="i686"
+fi
PLAT=$OSNAME.$HARDWARENAME
diff -Naur DarwinStreamingSrvr6.0.3-Source/PlaylistBroadcaster.tproj/BuildPlaylist DarwinStreamingSrvr6.0.3-Source.patched/PlaylistBroadcaster.tproj/BuildPlaylist
--- DarwinStreamingSrvr6.0.3-Source/PlaylistBroadcaster.tproj/BuildPlaylist 2002-09-09 20:07:18.000000000 -0500
+++ DarwinStreamingSrvr6.0.3-Source.patched/PlaylistBroadcaster.tproj/BuildPlaylist 2007-07-16 09:03:28.000000000 -0500
@@ -2,6 +2,9 @@
x=`uname`
y=`uname -m`
+if [ "$y" == "ppc64" ]; then
+ y="i686"
+fi
PLAT=$x.$y
diff -Naur DarwinStreamingSrvr6.0.3-Source/StreamingProxy.tproj/BuildProxy DarwinStreamingSrvr6.0.3-Source.patched/StreamingProxy.tproj/BuildProxy
--- DarwinStreamingSrvr6.0.3-Source/StreamingProxy.tproj/BuildProxy 2001-11-13 16:46:00.000000000 -0600
+++ DarwinStreamingSrvr6.0.3-Source.patched/StreamingProxy.tproj/BuildProxy 2007-07-16 09:03:42.000000000 -0500
@@ -2,6 +2,9 @@
x=`uname`
y=`uname -m`
+if [ "$y" == "ppc64" ]; then
+ y="i686"
+fi
PLAT=$x.$y

12
media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-x86_64-m32.patch Normal file
View file

@ -0,0 +1,12 @@
diff -Nur DarwinStreamingSrvr6.0.3-Source/Buildit DarwinStreamingSrvr6.0.3-Source.x86_64-m32/Buildit
--- DarwinStreamingSrvr6.0.3-Source/Buildit 2008-06-05 12:29:29.000000000 -0500
+++ DarwinStreamingSrvr6.0.3-Source.x86_64-m32/Buildit 2008-06-05 12:30:22.000000000 -0500
@@ -116,7 +116,7 @@
LINKER='gcc'
MAKE=make
- COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe -fPIC"
+ COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe -fPIC -m32"
INCLUDE_FLAG="-include"
CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"

4048
media-video/darwin-streaming-server/files/darwin-streaming-server-6.0.3-x86_64.patch Normal file
View file

File diff suppressed because it is too large Load diff

26
media-video/darwin-streaming-server/files/dss.rc Normal file
View file

@ -0,0 +1,26 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
depend() {
need net
use dns
}
start() {
ebegin "Starting Darwin Streaming Server"
start-stop-daemon --quiet --start --exec /usr/sbin/DarwinStreamingServer
eend $?
}
stop() {
ebegin "Stopping Darwin Streaming Server"
killall -s KILL DarwinStreamingServer
rm -f /var/run/DarwinStreamingServer.pid
eend $?
}
status() {
kill -0 `ps -Aww -o pid,cmd | grep --color=never "^[^r].*[D]arwinStreamingServer" | awk '{ print $1 }'` > /dev/null 2>&1
eend $?
}