Merge pull request #110 from ertugerata/master
strace, bridge-utils in main libinput fix deps.
This commit is contained in:
Ertuğrul Erata
@@ -0,0 +1,27 @@
|
||||
#!/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 get
|
||||
|
||||
|
||||
def setup():
|
||||
autotools.autoconf()
|
||||
autotools.configure("--prefix=/usr \
|
||||
--datarootdir=/usr/share \
|
||||
--with-linux-headers=/usr/include \
|
||||
--sbindir=/usr/bin \
|
||||
--sysconfdir=/etc")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
# autotools.install('SUBDIRS="brctl doc"')
|
||||
|
||||
pisitools.dodoc("AUTHORS", "COPYING", "ChangeLog", "README", "doc/FAQ", "doc/HOWTO")
|
||||
@@ -0,0 +1,10 @@
|
||||
--- bridge-utils-1.0.4/libbridge/libbridge_private.h~ 2004-05-28 21:38:38.000000000 +0100
|
||||
+++ bridge-utils-1.0.4/libbridge/libbridge_private.h 2004-07-01 11:24:21.000000000 +0100
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <linux/sockios.h>
|
||||
+#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/if_bridge.h>
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
|
||||
index 1decc28..65ea79a 100644
|
||||
--- a/libbridge/libbridge_devif.c
|
||||
+++ b/libbridge/libbridge_devif.c
|
||||
@@ -282,7 +282,7 @@ static int br_set(const char *bridge, const char *name,
|
||||
char path[SYSFS_PATH_MAX];
|
||||
FILE *f;
|
||||
|
||||
- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name);
|
||||
+ snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s", bridge, name);
|
||||
|
||||
f = fopen(path, "w");
|
||||
if (f) {
|
||||
@@ -0,0 +1,30 @@
|
||||
commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
|
||||
Author: Russell Senior <russell@personaltelco.net>
|
||||
Date: Wed Mar 6 12:49:42 2013 -0800
|
||||
|
||||
bridge-utils: Fix compile against linux-3.8.x
|
||||
|
||||
Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
|
||||
struct in6_addr but doesn't define it. The trivial seeming fix of
|
||||
including the header that does define it causes more problems. The
|
||||
problem was discussed on mailing lists in January 2013. The final
|
||||
suggestion I found was here:
|
||||
|
||||
http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
|
||||
|
||||
This is intended to implement that suggestion.
|
||||
|
||||
Signed-off-by: Russell Senior <russell@personaltelco.net>
|
||||
|
||||
diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
|
||||
index 39964f2..dd14bae 100644
|
||||
--- a/libbridge/libbridge.h
|
||||
+++ b/libbridge/libbridge.h
|
||||
@@ -20,6 +20,7 @@
|
||||
#define _LIBBRIDGE_H
|
||||
|
||||
#include <sys/socket.h>
|
||||
+#include <netinet/in.h>
|
||||
#include <linux/if.h>
|
||||
#include <linux/if_bridge.h>
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>bridge-utils</Name>
|
||||
<Homepage>http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Linux network bridging utilities</Summary>
|
||||
<Description>Containts userspace driver for IEEE 802.1d ethernet bridging (plus Spanning Tree protocol) for the linux kernel.</Description>
|
||||
<Archive sha1sum="19d2a58cd3a70f971aa931b40256174a847e60d6" type="targz">http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-1.5.tar.gz</Archive>
|
||||
<Patches>
|
||||
<Patch level="1">bridge-utils-1.0.4-inc.patch</Patch>
|
||||
<!--<Patch level="1">bridge-utils-1.2-show-ports.patch</Patch>
|
||||
<Patch level="1">bridge-utils-1.2-foreach.patch</Patch>-->
|
||||
<Patch level="1">bridge-utils-1.2-params.patch</Patch>-->
|
||||
<Patch level="1">bridge-utils-1.5-linux_3.8.x.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>bridge-utils</Name>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="man">/usr/share/man</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="2">
|
||||
<Date>2014-01-19</Date>
|
||||
<Version>1.5</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Stefan Gronewold(groni)</Name>
|
||||
<Email>groni@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-08-28</Date>
|
||||
<Version>1.5</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Osman Erkan</Name>
|
||||
<Email>osman.erkan@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>bridge-utils</Name>
|
||||
<Summary xml:lang="tr">Linux için ağ köprüleme yardımcı uygulamaları</Summary>
|
||||
<Description xml:lang="tr">Linux için ağ köprüleme yardımcı uygulamaları.</Description>
|
||||
</Source>
|
||||
</PISI>
|
||||
+2370
-68
File diff suppressed because it is too large
Load Diff
@@ -1 +1 @@
|
||||
016d170b806935fc56ca6816fb791bb4e637095f
|
||||
5657c178d3cbe1df9fa2ca0f39b1ef305ce5651b
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
b9277565fac2ec3ca8d8d216a117fd43c4cdb640
|
||||
3bddd9f0ab1d7adfcdc734a19d8abf6d2e90e7b2
|
||||
@@ -23,6 +23,7 @@
|
||||
<Package>
|
||||
<Name>libinput</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>eudev</Dependency>
|
||||
<Dependency>libevdev</Dependency>
|
||||
<Dependency>libmtdev</Dependency>
|
||||
</RuntimeDependencies>
|
||||
|
||||
@@ -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 get
|
||||
|
||||
def setup():
|
||||
#autotools.autoreconf("-vif")
|
||||
autotools.configure()
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def check():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("ChangeLog", "CREDITS", "NEWS", "README", "README-linux",)
|
||||
@@ -0,0 +1,44 @@
|
||||
--- strace-4.8/process.c.orig 2013-12-06 16:18:27.682402291 +0000
|
||||
+++ strace-4.8/process.c 2013-12-06 16:19:14.602165296 +0000
|
||||
@@ -63,7 +63,7 @@
|
||||
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
|
||||
# define pt_all_user_regs XXX_pt_all_user_regs
|
||||
# endif
|
||||
-# include <linux/ptrace.h>
|
||||
+# include <asm/ptrace.h>
|
||||
# undef ia64_fpreg
|
||||
# undef pt_all_user_regs
|
||||
#endif
|
||||
--- strace-4.8/signal.c.orig 2013-12-06 16:28:54.800551324 +0000
|
||||
+++ strace-4.8/signal.c 2013-12-06 16:30:26.033019415 +0000
|
||||
@@ -51,7 +51,7 @@
|
||||
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
|
||||
# define pt_all_user_regs XXX_pt_all_user_regs
|
||||
# endif
|
||||
-# include <linux/ptrace.h>
|
||||
+# include <asm/ptrace.h>
|
||||
# undef ia64_fpreg
|
||||
# undef pt_all_user_regs
|
||||
#endif
|
||||
--- strace-4.8/syscall.c.orig 2013-12-06 16:29:37.912245321 +0000
|
||||
+++ strace-4.8/syscall.c 2013-12-06 16:30:55.933500132 +0000
|
||||
@@ -48,7 +48,7 @@
|
||||
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
|
||||
# define pt_all_user_regs XXX_pt_all_user_regs
|
||||
# endif
|
||||
-# include <linux/ptrace.h>
|
||||
+# include <asm/ptrace.h>
|
||||
# undef ia64_fpreg
|
||||
# undef pt_all_user_regs
|
||||
#endif
|
||||
--- strace-4.8/util.c.orig 2013-12-06 16:29:44.382349431 +0000
|
||||
+++ strace-4.8/util.c 2013-12-06 16:31:04.267634082 +0000
|
||||
@@ -55,7 +55,7 @@
|
||||
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
|
||||
# define pt_all_user_regs XXX_pt_all_user_regs
|
||||
# endif
|
||||
-# include <linux/ptrace.h>
|
||||
+# include <asm/ptrace.h>
|
||||
# undef ia64_fpreg
|
||||
# undef pt_all_user_regs
|
||||
#endif
|
||||
@@ -0,0 +1,67 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>strace</Name>
|
||||
<Homepage>http://sourceforge.net/projects/strace/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>as-is</License>
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>Tracks and displays system calls associated with a running process</Summary>
|
||||
<Description>strace intercepts and records the system calls called and received by a running process. strace can print a record of each system call, its arguments and its return value.</Description>
|
||||
<Archive sha1sum="5e6c78f0dc75e64814e5f8ef49c66823b7f00ae9" type="tarxz">mirrors://sourceforge/strace/strace-4.9.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libaio-devel</Dependency>
|
||||
<Dependency>libunwind-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--<Patch level="1">strace-fix-ftbfs.patch</Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>strace</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libunwind</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="man">/usr/share/man</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2015-01-25</Date>
|
||||
<Version>4.9</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Stefan Gronewold(groni)</Name>
|
||||
<Email>groni@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2014-03-09</Date>
|
||||
<Version>4.8</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Varol Maksutoğlu</Name>
|
||||
<Email>waroi@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2013-04-20</Date>
|
||||
<Version>4.7</Version>
|
||||
<Comment>Versrion bump</Comment>
|
||||
<Name>Ertan Güven</Name>
|
||||
<Email>ertan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2011-04-18</Date>
|
||||
<Version>4.6</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Pisi Linux Admins</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>strace</Name>
|
||||
<Summary xml:lang="tr">Çalışan bir süreç ile ilişkili sistem çağrılarını gösteren bir araç</Summary>
|
||||
<Description xml:lang="tr">strace, çalışan bir UNIX süreci tarafından çağırılan ve alınan sistem çağrılarını, bu çağrılara verilen parametreleri ve dönüş değerlerini gösteren bir hata ayıklama aracıdır.</Description>
|
||||
<Summary xml:lang="es">Herramienta útil para diagnostico, aprendizaje y depuración</Summary>
|
||||
</Source>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user