Merge pull request #7616 from IdrisKalp/master

various packages
This commit is contained in:
Idris Kalp
2020-01-19 11:15:07 +03:00
committed by GitHub
35 changed files with 212082 additions and 211273 deletions
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Programming interface for IEEE 1394 based cameras</Summary>
<Description>libdc1394 is a library that is intended to provide a high level programming interface for application developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specification (found at http://www.1394ta.org/).</Description>
<Archive sha1sum="dae8a3ea7d800d438d813e1a14155cced5912a29" type="targz">https://sourceforge.net/projects/libdc1394/files/libdc1394-2/2.2.5/libdc1394-2.2.5.tar.gz</Archive>
<Archive sha1sum="af5fce93580585c485bb491f34a32c49bcb78b58" type="targz">https://sourceforge.net/projects/libdc1394/files/libdc1394-2/2.2.6/libdc1394-2.2.6.tar.gz</Archive>
<BuildDependencies>
<Dependency>libraw1394-devel</Dependency>
<Dependency>libusb-devel</Dependency>
@@ -46,6 +46,13 @@
</Package>
<History>
<Update release="6">
<Date>2020-01-18</Date>
<Version>2.2.6</Version>
<Comment>Version bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2018-08-01</Date>
<Version>2.2.5</Version>
+7
View File
@@ -65,6 +65,13 @@
</Package>
<History>
<Update release="7">
<Date>2020-01-18</Date>
<Version>2.9</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2018-07-29</Date>
<Version>2.9</Version>
+7
View File
@@ -53,6 +53,13 @@
</Package>
<History>
<Update release="4">
<Date>2020-01-18</Date>
<Version>0.3.2</Version>
<Comment>Rebuild.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="3">
<Date>2018-09-01</Date>
<Version>0.3.2</Version>
+7
View File
@@ -78,6 +78,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>2.3.1</Version>
<Comment>Rebuild.</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="4">
<Date>2019-11-05</Date>
<Version>2.3.1</Version>
+7 -4
View File
@@ -6,16 +6,19 @@
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import cmaketools
from pisi.actionsapi import get
def setup():
autotools.autoreconf("-fi")
autotools.configure("--enable-static=no")
#autotools.autoreconf("-fi")
#autotools.configure("--enable-static=no")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
#pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
cmaketools.configure()
def build():
autotools.make()
cmaketools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+11 -2
View File
@@ -12,13 +12,14 @@
<IsA>library</IsA>
<Summary>A plugin API for video sources and filters</Summary>
<Description>frei0r-plugins is a minimalistic plugin API for video sources and filters. The behaviour of the effects can be controlled from the host by simple parameters. The intent is to solve the recurring reimplementation or adaptation issue of standard effects.</Description>
<Archive sha1sum="e76c4608aff637822bbde8bf0b2a8ce0440b0141" type="targz">https://files.dyne.org/frei0r/releases/frei0r-plugins-1.6.1.tar.gz</Archive>
<Archive sha1sum="f56840b3d8235810ec1ce5f036c20f88ece6ddca" type="targz">https://files.dyne.org/frei0r/releases/frei0r-plugins-1.7.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>libgcc</Dependency>
<Dependency>cairo-devel</Dependency>
<!--<Dependency>gavl-devel</Dependency>-->
</BuildDependencies>
<Patches>
<Patch level="1">explicitly-link-with-lm.patch</Patch>
<!-- <Patch level="1">explicitly-link-with-lm.patch</Patch> -->
</Patches>
</Source>
@@ -26,6 +27,7 @@
<Name>frei0r-plugins</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>cairo</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -46,6 +48,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>1.7.0</Version>
<Comment>Version bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-08-03</Date>
<Version>1.6.1</Version>
+24
View File
@@ -0,0 +1,24 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.export("CFLAGS", "%s -fPIC" % get.CFLAGS())
shelltools.export("CXXFLAGS", "%s -fPIC" % get.CXXFLAGS())
autotools.autoreconf("-vfi")
autotools.configure("--disable-static")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("README.md", "COPYING")
+54
View File
@@ -0,0 +1,54 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libaribb24</Name>
<Homepage>https://github.com/nkoriyama/aribb24</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv3</License>
<IsA>library</IsA>
<Summary>Library for ARIB STD-B24, decoding JIS 8 bit characters and parsing MPEG-TS stream</Summary>
<Description>Library for ARIB STD-B24, decoding JIS 8 bit characters and parsing MPEG-TS stream</Description>
<Archive sha1sum="8d795c4dcab3a68a8a052ca6b99d55d2c6dbafaf" type="targz">https://github.com/nkoriyama/aribb24/archive/v1.0.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>libpng-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libaribb24</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>libaribb24-devel</Name>
<Summary>Development files for libaribb24</Summary>
<RuntimeDependencies>
<Dependency release="current">libaribb24</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="header">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2020-01-18</Date>
<Version>1.0.3</Version>
<Comment>First release</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
</History>
</PISI>
+7
View File
@@ -51,6 +51,13 @@
</Package>
<History>
<Update release="4">
<Date>2020-01-17</Date>
<Version>0.14.0</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2018-08-03</Date>
<Version>0.14.0</Version>
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Library to access Blu-Ray disks for video playback</Summary>
<Description>Libbluray package is aiming to provide a full portable free open source bluray library, which can be plugged into popular media players to allow full bluray navigation and playback on Linux. It will eventually be compatible with all current titles, and will be easily portable and embeddable in standard players such as mplayer and vlc.</Description>
<Archive sha1sum="025ef1c0a25b42f4a13a9fb2df09fc9cef1a821b" type="tarbz2">ftp://ftp.videolan.org/pub/videolan/libbluray/1.0.2/libbluray-1.0.2.tar.bz2</Archive>
<Archive sha1sum="3885c0d0bd0f04a3a372ceec3a01a44a7624f272" type="tarbz2">ftp://ftp.videolan.org/pub/videolan/libbluray/1.1.2/libbluray-1.1.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libtool</Dependency>
<Dependency>doxygen</Dependency>
@@ -63,6 +63,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>1.1.2</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2018-08-03</Date>
<Version>1.0.2</Version>
+2 -2
View File
@@ -10,10 +10,10 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
WorkDir = "ladspa_sdk/src"
WorkDir = "ladspa_sdk_%s/src" % get.srcVERSION()
def setup():
pisitools.dosed("makefile", "-Werror", get.CFLAGS())
pisitools.dosed("Makefile", "-Werror", get.CFLAGS())
def build():
autotools.make('CC="%s" \
@@ -1,6 +1,6 @@
diff -Nur ladspa_sdk-old/src/makefile ladspa_sdk/src/makefile
--- ladspa_sdk-old/src/makefile 2008-04-04 20:13:49.000000000 +0300
+++ ladspa_sdk/src/makefile 2008-04-04 20:14:03.000000000 +0300
--- ladspa_sdk-old/src/Makefile 2008-04-04 20:13:49.000000000 +0300
+++ ladspa_sdk/src/Makefile 2008-04-04 20:14:03.000000000 +0300
@@ -13,10 +13,12 @@
# GENERAL
#
+11 -4
View File
@@ -12,12 +12,12 @@
<IsA>library</IsA>
<Summary>The Linux Audio Developer's Simple Plugin API</Summary>
<Description>The Linux Audio Developer's Simple Plugin API (LADSPA) attempts to give programmers the ability to write simple `plugin' audio processors in C/C++ and link them dynamically against a range of host applications</Description>
<Archive sha1sum="2b69e28afb62c0d97943124f48ed82de796f83ed" type="targz">http://pkgs.fedoraproject.org/repo/pkgs/ladspa/ladspa_sdk_1.13.tgz/671be3e1021d0722cadc7fb27054628e/ladspa_sdk_1.13.tgz</Archive>
<Archive sha1sum="b7bbbf47e00b6c5248b35796a362644393457878" type="targz">http://www.ladspa.org/download/ladspa_sdk_1.15.tgz</Archive>
<Patches>
<Patch>ladspa-sdk-1.12-gcc4.patch</Patch>
<Patch level="2">properbuild.patch</Patch>
<Patch>asneeded.patch</Patch>
<Patch level="2">notests.patch</Patch>
<!-- <Patch level="2">properbuild.patch</Patch> -->
<!-- <Patch>asneeded.patch</Patch> -->
<!-- <Patch level="2">notests.patch</Patch> -->
</Patches>
</Source>
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>1.15</Version>
<Comment>Version bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-08-07</Date>
<Version>1.13</Version>
+10 -5
View File
@@ -10,11 +10,16 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
#WorkDir = "flite-%s-current" % get.srcVERSION()
NoStrip = ["/usr/lib"]
def setup():
autotools.configure("--prefix=/usr \
--with-audio=alsa \
--with-vox=cmu_us_kal16")
def setup():
#shelltools.system("sed '/^#VOXES.*$/d; s/+//g; s/cmu_indic_lex/&\nVOXES = cmu_us_kal16 cmu_us_slt/' config/android.lv >config/pisilinux.lv")
#shelltools.system("sed -i '/$(INSTALL) -m 755 $(BINDIR)\/flite_time $(DESTDIR)$(INSTALLBINDIR)/d' main/Makefile")
shelltools.export("LDFLAGS", "-lasound -lm")
autotools.configure("--prefix=/usr \
--with-audio=alsa \
--with-vox=cmu_us_kal16")
def build():
autotools.make()
@@ -22,4 +27,4 @@ def build():
def install():
autotools.install()
pisitools.dodoc("COPYING", "README")
pisitools.dodoc("COPYING", "README*")
+7
View File
@@ -46,6 +46,13 @@
</Package>
<History>
<Update release="7">
<Date>2020-01-18</Date>
<Version>2.0.0</Version>
<Comment>Rebuild</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-08-05</Date>
<Version>2.0.0</Version>
+7
View File
@@ -44,6 +44,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>0.8.9.0</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-08-01</Date>
<Version>0.8.9.0</Version>
+8 -5
View File
@@ -16,15 +16,18 @@ def setup():
-DPULSEAUDIO=1 \
-DOSS=1 \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DEXAMPLES=OFF"
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DEXAMPLES=OFF \
-DALSOFT_TESTS=OFF"
if get.buildTYPE() == "emul32":
options += " -DCMAKE_INSTALL_BINDIR=/emul32/bin \
-DCMAKE_INSTALL_LIBDIR=lib32 \
options += " -DCMAKE_INSTALL_PREFIX=/emul32 \
-DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
-DALSOFT_NO_QT5=TRUE \
-DLIB_SUFFIX=32 \
-DALSOFT_TESTS=OFF \
-DALSOFT_EXAMPLES=OFF \
-DLIB_SUFFIX=32"
-DALSOFT_UTILS=OFF"
shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS())
cmaketools.configure(options)
+9 -2
View File
@@ -16,7 +16,7 @@
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
<!-- <Dependency>ffmpeg-devel</Dependency> -->
<Dependency>libsdl2-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
@@ -34,7 +34,7 @@
<Package>
<Name>openal</Name>
<RuntimeDependencies>
<Dependency>ffmpeg</Dependency>
<!-- <Dependency>ffmpeg</Dependency> -->
<Dependency>libsdl2</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>qt5-base</Dependency>
@@ -85,6 +85,13 @@
</Package>
<History>
<Update release="8">
<Date>2020-01-18</Date>
<Version>1.20.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2019-12-04</Date>
<Version>1.20.0</Version>
+7
View File
@@ -45,6 +45,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>0.3.13</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-08-07</Date>
<Version>0.3.13</Version>
+7
View File
@@ -37,6 +37,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>5.1.0</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-08-03</Date>
<Version>5.1.0</Version>
@@ -0,0 +1,248 @@
https://raw.githubusercontent.com/xbmc/inputstream.rtmp/master/depends/common/librtmp/0003-openssl-1.1.patch
See also https://github.com/xbmc/inputstream.rtmp/pull/46
--- a/librtmp/dh.h
+++ b/librtmp/dh.h
@@ -253,20 +253,42 @@
if (!dh)
goto failed;
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
MP_new(dh->g);
if (!dh->g)
goto failed;
+#else
+ BIGNUM *g = NULL;
+ MP_new(g);
+ if (!g)
+ goto failed;
+#endif
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */
+#else
+ BIGNUM* p = NULL;
+ DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL);
+ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */
+#endif
if (!res)
{
goto failed;
}
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
MP_set_w(dh->g, 2); /* base 2 */
+#else
+ MP_set_w(g, 2); /* base 2 */
+ DH_set0_pqg(dh, p, NULL, g);
+#endif
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
dh->length = nKeyBits;
+#else
+ DH_set_length(dh, nKeyBits);
+#endif
return dh;
failed:
@@ -293,12 +315,24 @@
MP_gethex(q1, Q1024, res);
assert(res);
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
res = isValidPublicKey(dh->pub_key, dh->p, q1);
+#else
+ BIGNUM const* pub_key = NULL;
+ BIGNUM const* p = NULL;
+ DH_get0_key(dh, &pub_key, NULL);
+ DH_get0_pqg(dh, &p, NULL, NULL);
+ res = isValidPublicKey((BIGNUM*)pub_key, (BIGNUM*)p, q1);
+#endif
if (!res)
{
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
MP_free(dh->pub_key);
MP_free(dh->priv_key);
dh->pub_key = dh->priv_key = 0;
+#else
+ DH_free(dh);
+#endif
}
MP_free(q1);
@@ -314,15 +348,29 @@
DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
{
int len;
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
if (!dh || !dh->pub_key)
+#else
+ BIGNUM const* pub_key = NULL;
+ DH_get0_key(dh, &pub_key, NULL);
+ if (!dh || !pub_key)
+#endif
return 0;
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
len = MP_bytes(dh->pub_key);
+#else
+ len = MP_bytes(pub_key);
+#endif
if (len <= 0 || len > (int) nPubkeyLen)
return 0;
memset(pubkey, 0, nPubkeyLen);
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
+#else
+ MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len);
+#endif
return 1;
}
@@ -364,7 +412,13 @@
MP_gethex(q1, Q1024, len);
assert(len);
+#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
if (isValidPublicKey(pubkeyBn, dh->p, q1))
+#else
+ BIGNUM const* p = NULL;
+ DH_get0_pqg(dh, &p, NULL, NULL);
+ if (isValidPublicKey(pubkeyBn, (BIGNUM*)p, q1))
+#endif
res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
else
res = -1;
--- a/librtmp/handshake.h
+++ b/librtmp/handshake.h
@@ -31,9 +31,9 @@
#define SHA256_DIGEST_LENGTH 32
#endif
#define HMAC_CTX sha2_context
-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len)
-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
+#define HMAC_setup(ctx, key, len) sha2_hmac_starts(ctx, (unsigned char *)key, len, 0)
+#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len)
+#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
typedef arc4_context * RC4_handle;
#define RC4_alloc(h) *h = malloc(sizeof(arc4_context))
@@ -50,9 +50,9 @@
#endif
#undef HMAC_CTX
#define HMAC_CTX struct hmac_sha256_ctx
-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key)
-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf)
-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
+#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(ctx, len, key)
+#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf)
+#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
#define HMAC_close(ctx)
typedef struct arcfour_ctx* RC4_handle;
@@ -64,14 +64,23 @@
#else /* USE_OPENSSL */
#include <openssl/sha.h>
+#include <openssl/ossl_typ.h>
#include <openssl/hmac.h>
#include <openssl/rc4.h>
#if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH)
#error Your OpenSSL is too old, need 0.9.8 or newer with SHA256
#endif
-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len)
-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
+#else
+#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
+#endif
+#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_cleanup(ctx)
+#else
+#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx)
+#endif
typedef RC4_KEY * RC4_handle;
#define RC4_alloc(h) *h = malloc(sizeof(RC4_KEY))
@@ -117,7 +126,7 @@
{
uint8_t digest[SHA256_DIGEST_LENGTH];
unsigned int digestLen = 0;
- HMAC_CTX ctx;
+ HMAC_CTX* ctx = NULL;
RC4_alloc(rc4keyIn);
RC4_alloc(rc4keyOut);
@@ -266,7 +275,7 @@
size_t keylen, uint8_t *digest)
{
unsigned int digestLen;
- HMAC_CTX ctx;
+ HMAC_CTX* ctx = NULL;
HMAC_setup(ctx, key, keylen);
HMAC_crunch(ctx, message, messageLen);
--- a/librtmp/hashswf.c
+++ b/librtmp/hashswf.c
@@ -37,9 +37,9 @@
#define SHA256_DIGEST_LENGTH 32
#endif
#define HMAC_CTX sha2_context
-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len)
-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
+#define HMAC_setup(ctx, key, len) sha2_hmac_starts(ctx, (unsigned char *)key, len, 0)
+#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len)
+#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
#define HMAC_close(ctx)
#elif defined(USE_GNUTLS)
#include <nettle/hmac.h>
@@ -48,19 +48,27 @@
#endif
#undef HMAC_CTX
#define HMAC_CTX struct hmac_sha256_ctx
-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key)
-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf)
-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
+#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(ctx, len, key)
+#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf)
+#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
#define HMAC_close(ctx)
#else /* USE_OPENSSL */
#include <openssl/ssl.h>
#include <openssl/sha.h>
#include <openssl/hmac.h>
#include <openssl/rc4.h>
-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0)
-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, (unsigned char *)buf, len)
-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, (unsigned char *)dig, &dlen);
-#define HMAC_close(ctx) HMAC_CTX_cleanup(&ctx)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0)
+#else
+#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
+#endif
+#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len)
+#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define HMAC_close(ctx) HMAC_CTX_cleanup(ctx)
+#else
+#define HMAC_close(ctx) HMAC_CTX_reset(ctx); HMAC_CTX_free(ctx)
+#endif
#endif
extern void RTMP_TLS_Init();
@@ -289,7 +297,7 @@
struct info
{
z_stream *zs;
- HMAC_CTX ctx;
+ HMAC_CTX *ctx;
int first;
int zlib;
int size;
@@ -0,0 +1,13 @@
diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
index 5311a8a..79fefae 100644
--- a/librtmp/rtmp.c
+++ b/librtmp/rtmp.c
@@ -2854,7 +2854,7 @@ HandleCtrl(RTMP *r, const RTMPPacket *packet)
if (nType == 0x1A)
{
RTMP_Log(RTMP_LOGDEBUG, "%s, SWFVerification ping received: ", __FUNCTION__);
- if (packet->m_nBodySize > 2 && packet->m_body[2] > 0x01)
+ if (packet->m_nBodySize > 2 && packet->m_body[2] > 0x02)
{
RTMP_Log(RTMP_LOGERROR,
"%s: SWFVerification Type %d request not supported! Patches welcome...",
@@ -0,0 +1,21 @@
diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
index df2cb27..b72dc64 100644
--- a/librtmp/rtmp.c
+++ b/librtmp/rtmp.c
@@ -2857,14 +2857,14 @@ HandleCtrl(RTMP *r, const RTMPPacket *packet)
if (packet->m_nBodySize > 2 && packet->m_body[2] > 0x01)
{
RTMP_Log(RTMP_LOGERROR,
- "%s: SWFVerification Type %d request not supported! Patches welcome...",
+ "%s: SWFVerification Type %d request not supported, attempting to use SWFVerification Type 1! Patches welcome...",
__FUNCTION__, packet->m_body[2]);
}
#ifdef CRYPTO
/*RTMP_LogHex(packet.m_body, packet.m_nBodySize); */
/* respond with HMAC SHA256 of decompressed SWF, key is the 30byte player key, also the last 30 bytes of the server handshake are applied */
- else if (r->Link.SWFSize)
+ if (r->Link.SWFSize)
{
RTMP_SendCtrl(r, 0x1B, 0, 0);
}
+13 -1
View File
@@ -15,11 +15,16 @@
<IsA>library</IsA>
<Summary>Toolkit for RTMP streams</Summary>
<Description>rtmpdump is a tool for dumping media content streamed over RTMP. All forms of RTMP are supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps:// .</Description>
<Archive sha1sum="b981d669a6aeabb08f2b58262b6299d4ead62c29" type="targz">http://source.pisilinux.org/1.0/rtmpdump-15012015.tar.gz</Archive>
<Archive sha1sum="8bf5aee002885b410c0656d16f72f6d227c33e7b" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/rtmpdump-20190330.tar.xz</Archive>
<BuildDependencies>
<Dependency>openssl-devel</Dependency>
<Dependency>zlib-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">rtmpdump-openssl-1.1-v2.patch</Patch>
<Patch level="1">rtmpdump-swf_vertification_type_2.patch</Patch>
<Patch level="1">rtmpdump-swf_vertification_type_2_part_2.patch</Patch>
</Patches>
</Source>
<Package>
@@ -51,6 +56,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>20190330</Version>
<Comment>Version bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-08-01</Date>
<Version>20150115</Version>
+7
View File
@@ -38,6 +38,13 @@
</Package>
<History>
<Update release="2">
<Date>2020-01-18</Date>
<Version>2.0.1</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2019-11-04</Date>
<Version>2.0.1</Version>
+14 -5
View File
@@ -25,12 +25,21 @@ def setup():
def build():
autotools.make()
if get.buildTYPE() == "emul32":
autotools.make("-C lib")
else:
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
if get.buildTYPE() == "emul32": return
if get.buildTYPE() == "emul32":
autotools.make("MAKEFLAGS='-j1' -C lib DESTDIR=%s install" % get.installDIR())
pisitools.removeDir("/emul32")
else:
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#if get.buildTYPE() == "emul32": return
pisitools.dodoc("ChangeLog", "COPYING*", "README*", "TODO")
pisitools.insinto("/%s/%s/" % (get.docDIR(), get.srcNAME()), "contrib")
pisitools.dodoc("ChangeLog", "COPYING*", "README*", "TODO")
pisitools.insinto("/%s/%s/" % (get.docDIR(), get.srcNAME()), "contrib")
+17 -6
View File
@@ -13,12 +13,12 @@
<IsA>library</IsA>
<Summary>V4L wrapper for V4L2</Summary>
<Description>A library to access V4L2 API with V4L1 alike calls.</Description>
<Archive sha1sum="e723e9ec2d2ca3ccfcaf87d4a52160f601cab3ab" type="tarbz2">https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.2.tar.bz2</Archive>
<Archive sha1sum="3c3c9d4c9924f0153974ebcf8554331e04914050" type="tarbz2">https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.18.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>glibc-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>libglvnd-devel</Dependency>
<Dependency>mesa-glu-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>libgcc</Dependency>
@@ -31,6 +31,10 @@
<Name>libv4l</Name>
<RuntimeDependencies>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>eudev</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency>mesa-glu</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/lib/udev/rules.d</Path>
@@ -45,7 +49,7 @@
<Name>v4l-utils</Name>
<Summary>Utilities for libv4l</Summary>
<RuntimeDependencies>
<Dependency>mesa</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>qt5-base</Dependency>
@@ -68,7 +72,7 @@
<Name>libv4l-devel</Name>
<Summary>Development files for libv4l</Summary>
<RuntimeDependencies>
<Dependency>mesa</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency>libX11</Dependency>
<Dependency>mesa-glu</Dependency>
<Dependency release="current">libv4l</Dependency>
@@ -88,10 +92,10 @@
<BuildDependencies>
<Dependency>libjpeg-turbo-32bit</Dependency>
<Dependency>libX11-32bit</Dependency>
<Dependency>mesa-32bit</Dependency>
<Dependency>libglvnd-32bit</Dependency>
<Dependency>mesa-glu-32bit</Dependency>
<Dependency>alsa-lib-32bit</Dependency>
<Dependency>qt5-base-32bit</Dependency>
<!-- <Dependency>qt5-base-32bit</Dependency> -->
<Dependency>eudev-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
@@ -105,6 +109,13 @@
</Package>
<History>
<Update release="8">
<Date>2020-01-18</Date>
<Version>1.18.0</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2018-10-16</Date>
<Version>1.14.2</Version>
+4 -4
View File
@@ -36,12 +36,12 @@
</Package>
<History>
<Update release="5">
<Date>2018-07-31</Date>
<Update release="5">
<Date>2020-01-18</Date>
<Version>0.1.5</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-03-26</Date>
+6 -1
View File
@@ -6,13 +6,18 @@
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
autotools.configure()
shelltools.export("JAVA_HOME", "/usr/lib/jvm/java-7-openjdk")
autotools.autoreconf("-vfi")
autotools.configure()
def build():
autotools.make()
autotools.make("jni")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+10 -1
View File
@@ -12,13 +12,15 @@
<IsA>library</IsA>
<Summary>Zaman-germe ve zift-shifting ses kütüphanesi ve yardımcı programı</Summary>
<Description>Zaman-germe ve zift-shifting ses kütüphanesi ve yardımcı programı</Description>
<Archive sha1sum="c44b8c2751bb11ae60d4edb6254907787a9e504d" type="targz">https://github.com/breakfastquay/rubberband/archive/v1.8.1.tar.gz</Archive>
<Archive sha1sum="f4aa50a096574d8157b7bf2d3abafd2344760343" type="targz">https://github.com/breakfastquay/rubberband/archive/v1.8.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>vamp-plugin-sdk-devel</Dependency>
<Dependency>libsamplerate-devel</Dependency>
<Dependency>libsndfile-devel</Dependency>
<Dependency>ladspa-sdk-devel</Dependency>
<Dependency>fftw3-devel</Dependency>
<Dependency>jdk7-openjdk</Dependency>
<Dependency>fftw3-devel</Dependency>
</BuildDependencies>
</Source>
@@ -50,6 +52,13 @@
</Package>
<History>
<Update release="2">
<Date>2020-01-18</Date>
<Version>1.8.1</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2018-08-03</Date>
<Version>1.8.1</Version>
+7
View File
@@ -45,6 +45,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-18</Date>
<Version>1.3</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-08-02</Date>
<Version>1.3</Version>
+211510 -211225
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
e324348b91f7b8e8f958bc9ea6d909a6169c95c3
06a864fbe305a0787af2e84b81209dede6f9f29a
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
0f9953a8e704f270ef0cc58b0c93f803b4e75ff1
a2e40a9379cc5a8580e26d72295b067cec550b03