This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 70f438159dcff578f59b90e48b17f69980445051 (commit) via 5940e04ed9142d1437e65f4efbe9b2439aac6b30 (commit) via 4c8387a1518d93a125d66b7b5f996c7c2e87a3d2 (commit) via 95ded96f275c3d0766bacd12d0126240c5192d1f (commit) via ccdbc4b0c11f6bebc7562ea12e8c3c472b95f95b (commit) via 0cb82a6b9cef6301daf3823f3b7bac31e959d241 (commit) via 1e44ffd03068a1b9d9fded70368e3e177e5f23e0 (commit) via 4e2759c1208e0ca56131cf72ccff8925bb97128f (commit) via b50476c9877a3655046551bc6c925316447351fa (commit) via b5ddf7dbf9ea133a1ba5983e62cb06d6d3930fb1 (commit) via c4bf67f8558a1303f070f8db195218face9d89c3 (commit) via 4339e71e5450b4eb60a6172e07ea40df02197e03 (commit) via c6c409aae8db02f3bac2275151d01d22e40ade06 (commit) via 71d6aa99bf7791e35bc900b5bfd7d01e2ee0e785 (commit) via fc47dab4212c531be9dee66d832b7144c060a2ee (commit) from 7faf73f4ff14eb316f2438248c16c48ab0fea4de (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 70f438159dcff578f59b90e48b17f69980445051 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 20:15:16 2010 +0200

mc: Update to 4.7.3.

commit 5940e04ed9142d1437e65f4efbe9b2439aac6b30 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 19:54:13 2010 +0200

hdparm: Update to 9.29.

commit 4c8387a1518d93a125d66b7b5f996c7c2e87a3d2 Merge: 95ded96 ccdbc4b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 17 20:21:09 2010 +0200

Merge remote branch 'stevee/logrotate' into next

commit 95ded96f275c3d0766bacd12d0126240c5192d1f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 17 20:20:33 2010 +0200

suricata: Fix name of logrotate file.

commit ccdbc4b0c11f6bebc7562ea12e8c3c472b95f95b Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 19:32:00 2010 +0200

logrotate: Add upstart jobfile.

commit 0cb82a6b9cef6301daf3823f3b7bac31e959d241 Merge: c4bf67f 1e44ffd Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 17 19:06:18 2010 +0200

Merge remote branch 'stevee/suricata' into next

commit 1e44ffd03068a1b9d9fded70368e3e177e5f23e0 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 19:02:50 2010 +0200

suricata: Add logrotate file.

commit 4e2759c1208e0ca56131cf72ccff8925bb97128f Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 19:02:14 2010 +0200

suricata: Imporove funktions.

commit b50476c9877a3655046551bc6c925316447351fa Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 19:01:48 2010 +0200

libnet: New package.

commit b5ddf7dbf9ea133a1ba5983e62cb06d6d3930fb1 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 19:01:20 2010 +0200

libcap-ng: New package.

commit c4bf67f8558a1303f070f8db195218face9d89c3 Merge: 4339e71 c6c409a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 17 15:44:33 2010 +0200

Merge commit 'stevee/suricata' into next

commit 4339e71e5450b4eb60a6172e07ea40df02197e03 Merge: 7faf73f fc47dab Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 17 15:44:03 2010 +0200

Merge commit 'stevee/updates' into next

commit c6c409aae8db02f3bac2275151d01d22e40ade06 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 14:35:46 2010 +0200

New package: Suricata.

commit 71d6aa99bf7791e35bc900b5bfd7d01e2ee0e785 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Jul 17 14:21:18 2010 +0200

libyaml: New package.

This is a dependency of suricata.

commit fc47dab4212c531be9dee66d832b7144c060a2ee Author: Schantl Stefan Stevee@ipfire.org Date: Tue Jul 13 19:22:07 2010 +0200

glib2: Update to 2.25.11.

-----------------------------------------------------------------------

Summary of changes: pkgs/core/glib2/glib2.nm | 2 +- pkgs/core/hdparm/hdparm.nm | 13 +---- .../{eggdbus/eggdbus.nm => libcap-ng/libcap-ng.nm} | 23 ++++++---- .../libcap-ng/patches/libcap-ng-0.6.5-device.patch | 41 ++++++++++++++++++ pkgs/core/{libssh2/libssh2.nm => libnet/libnet.nm} | 28 ++++-------- .../libnet/patches/libnet-1.1.4-capability.patch | 45 ++++++++++++++++++++ pkgs/core/{mpc/mpc.nm => libyaml/libyaml.nm} | 22 +++++---- pkgs/core/logrotate/logrotate.init | 4 ++ pkgs/core/mc/mc.nm | 2 +- pkgs/core/suricata/suricata.logrotate | 9 ++++ .../{dejagnu/dejagnu.nm => suricata/suricata.nm} | 35 ++++++++------- 11 files changed, 158 insertions(+), 66 deletions(-) copy pkgs/core/{eggdbus/eggdbus.nm => libcap-ng/libcap-ng.nm} (80%) create mode 100644 pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch copy pkgs/core/{libssh2/libssh2.nm => libnet/libnet.nm} (76%) create mode 100644 pkgs/core/libnet/patches/libnet-1.1.4-capability.patch copy pkgs/core/{mpc/mpc.nm => libyaml/libyaml.nm} (80%) create mode 100644 pkgs/core/logrotate/logrotate.init create mode 100644 pkgs/core/suricata/suricata.logrotate copy pkgs/core/{dejagnu/dejagnu.nm => suricata/suricata.nm} (73%)

Difference in files: diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/core/glib2/glib2.nm index c2ec625..4c3ce5a 100644 --- a/pkgs/core/glib2/glib2.nm +++ b/pkgs/core/glib2/glib2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = glib -PKG_VER = 2.25.10 +PKG_VER = 2.25.11 PKG_REL = 0

PKG_MAINTAINER = diff --git a/pkgs/core/hdparm/hdparm.nm b/pkgs/core/hdparm/hdparm.nm index 67a32ab..b28c4ed 100644 --- a/pkgs/core/hdparm/hdparm.nm +++ b/pkgs/core/hdparm/hdparm.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = hdparm -PKG_VER = 9.27 +PKG_VER = 9.29 PKG_REL = 0

PKG_MAINTAINER = @@ -42,16 +42,9 @@ endef

PKG_TARBALL = $(THISAPP).tar.gz

-############################################################################### -# Installation Details -############################################################################### - define STAGE_BUILD - # fix sgio.c failur - cd $(DIR_APP) && mv sgio.c sgio.c.orig - cd $(DIR_APP) && grep -v "#include <scsi/scsi.h>" sgio.c.orig > sgio.c - cd $(DIR_APP) && sed -i -e "s/-O2/$(CFLAGS)/g" Makefile - cd $(DIR_APP) && make $(PARALLELISMFLAGS) + $(DO_FIX_LIBTOOL) + cd $(DIR_APP) && CFLAGS="$(CFLAGS)" make $(PARALELLIAMFLAGS) LDFLAGS= endef

define STAGE_INSTALL diff --git a/pkgs/core/libcap-ng/libcap-ng.nm b/pkgs/core/libcap-ng/libcap-ng.nm new file mode 100644 index 0000000..111ab8b --- /dev/null +++ b/pkgs/core/libcap-ng/libcap-ng.nm @@ -0,0 +1,53 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libcap-ng +PKG_VER = 0.6.4 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://people.redhat.com/sgrubb/libcap-ng +PKG_LICENSE = LGPLv2+ +PKG_SUMMARY = An alternate posix capabilities library. + +PKG_DEPS += attr kernel-headers python + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +define PKG_DESCRIPTION + Libcap-ng is a library that makes using posix capabilities \ + easier. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +#CONFIGURE_OPTIONS += \ + +# XXX Testsuite is broken by the package developers +#define STAGE_TEST +# cd $(DIR_APP) && make check +#endef diff --git a/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch b/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch new file mode 100644 index 0000000..7effd72 --- /dev/null +++ b/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch @@ -0,0 +1,41 @@ +diff -urp libcap-ng-0.6.5.orig/utils/filecap.c libcap-ng-0.6.5/utils/filecap.c +--- libcap-ng-0.6.5.orig/utils/filecap.c 2010-06-17 13:19:21.000000000 -0400 ++++ libcap-ng-0.6.5/utils/filecap.c 2010-06-17 14:25:07.000000000 -0400 +@@ -41,12 +41,15 @@ static void usage(void) + exit(1); + } + +-static int check_file(const char *file, +- const struct stat *sb_unused __attribute__ ((unused)), +- int flag_unused __attribute__ ((unused)), ++static int check_file(const char *fpath, ++ const struct stat *sb, ++ int typeflag_unused __attribute__ ((unused)), + struct FTW *s_unused __attribute__ ((unused))) + { +- int fd = open(file, O_RDONLY); ++ if (S_ISREG(sb->st_mode) == 0) ++ return FTW_CONTINUE; ++ ++ int fd = open(fpath, O_RDONLY); + if (fd >= 0) { + capng_results_t rc; + +@@ -58,7 +61,7 @@ static int check_file(const char *file, + header = 1; + printf("%-20s capabilities\n", "file"); + } +- printf("%s ", file); ++ printf("%s ", fpath); + if (rc == CAPNG_FULL) + printf("full"); + else +@@ -68,7 +71,7 @@ static int check_file(const char *file, + } + close(fd); + } +- return 0; ++ return FTW_CONTINUE; + } + + diff --git a/pkgs/core/libnet/libnet.nm b/pkgs/core/libnet/libnet.nm new file mode 100644 index 0000000..051010b --- /dev/null +++ b/pkgs/core/libnet/libnet.nm @@ -0,0 +1,48 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libnet +PKG_VER = 1.1.4 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.sourceforge.net/projects/libnet-dev/ +PKG_LICENSE = BSD +PKG_SUMMARY = C library for portable packet creation and injection. + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +define PKG_DESCRIPTION +Libnet is an API to help with the construction and handling of \ + network packets. It provides a portable framework for low-level \ + network packet writing and handling (use libnet in conjunction \ + with libpcap and you can write some really cool stuff). Libnet \ + includes packet creation at the IP layer and at the link layer \ + as well as a host of supplementary and complementary functionality. +endef + +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/libnet/patches/libnet-1.1.4-capability.patch b/pkgs/core/libnet/patches/libnet-1.1.4-capability.patch new file mode 100644 index 0000000..a29dce2 --- /dev/null +++ b/pkgs/core/libnet/patches/libnet-1.1.4-capability.patch @@ -0,0 +1,45 @@ +Patch by Robert Scheck robert@fedoraproject.org for libnet >= 1.1.4, which backports +capability support instead of explicitly checking for UID 0. Further information can be +found at the following links: + + - https://bugzilla.redhat.com/show_bug.cgi?id=589770 + - http://github.com/sam-github/libnet/commit/671742244c20804c9e935326e3649dac3... + +--- libnet-1.1.4/src/libnet_init.c 2009-06-05 02:31:44.000000000 +0200 ++++ libnet-1.1.4/src/libnet_init.c.capability 2010-07-09 22:57:10.000000000 +0200 +@@ -44,14 +44,7 @@ + { + libnet_t *l = NULL; + +-#if !defined(__WIN32__) +- if (getuid() && geteuid()) +- { +- snprintf(err_buf, LIBNET_ERRBUF_SIZE, +- "%s(): UID or EUID of 0 required\n", __func__); +- goto bad; +- } +-#else ++#if defined(__WIN32__) + WSADATA wsaData; + + if ((WSAStartup(0x0202, &wsaData)) != 0) +--- libnet-1.1.4/src/libnet_link_linux.c 2009-06-05 02:31:44.000000000 +0200 ++++ libnet-1.1.4/src/libnet_link_linux.c.capability 2010-07-09 22:58:33.000000000 +0200 +@@ -90,8 +90,15 @@ + + if (ioctl(l->fd, SIOCGIFHWADDR, &ifr) < 0 ) + { +- snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, +- "SIOCGIFHWADDR: %s", strerror(errno)); ++ if (errno == EPERM) { ++ snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, ++ "%s(): UID/EUID 0 or capability CAP_NET_RAW required", ++ __func__); ++ ++ } else { ++ snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, ++ "socket: %s", strerror(errno)); ++ } + goto bad; + } + diff --git a/pkgs/core/libyaml/libyaml.nm b/pkgs/core/libyaml/libyaml.nm new file mode 100644 index 0000000..83a069a --- /dev/null +++ b/pkgs/core/libyaml/libyaml.nm @@ -0,0 +1,51 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libyaml +PKG_VER = 0.1.3 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://pyyaml.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = YAML 1.1 parser and emitter written in C. + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +define PKG_DESCRIPTION + YAML is a data serialization format designed for human readability \ + and interaction with scripting languages. LibYAML is a YAML parser \ + and emitter written in C. +endef + +PKG_TARBALL = yaml-$(PKG_VER).tar.gz + +DIR_APP = $(DIR_SRC)/yaml-$(PKG_VER) + +define STAGE_TEST + cd $(DIR_APP) && make check +endef diff --git a/pkgs/core/logrotate/logrotate.init b/pkgs/core/logrotate/logrotate.init new file mode 100644 index 0000000..f09ba22 --- /dev/null +++ b/pkgs/core/logrotate/logrotate.init @@ -0,0 +1,4 @@ +description "Launches logrotate" +author "IPFire Team" + +exec logrotate /etc/logrotate.d/* diff --git a/pkgs/core/mc/mc.nm b/pkgs/core/mc/mc.nm index 49e180a..4fe7311 100644 --- a/pkgs/core/mc/mc.nm +++ b/pkgs/core/mc/mc.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = mc -PKG_VER = 4.7.2 +PKG_VER = 4.7.3 PKG_REL = 0

PKG_MAINTAINER = diff --git a/pkgs/core/suricata/suricata.logrotate b/pkgs/core/suricata/suricata.logrotate new file mode 100644 index 0000000..c4ece8c --- /dev/null +++ b/pkgs/core/suricata/suricata.logrotate @@ -0,0 +1,9 @@ +/var/log/suricata/*.log { + daily + missingok + rotate 5 + compress + delaycompress + copytruncate + minsize 500k +} diff --git a/pkgs/core/suricata/suricata.nm b/pkgs/core/suricata/suricata.nm new file mode 100644 index 0000000..ed565e1 --- /dev/null +++ b/pkgs/core/suricata/suricata.nm @@ -0,0 +1,59 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = suricata +PKG_VER = 1.0.0 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Networking/IDS +PKG_URL = http://www.openinfosecfoundation.org/ +PKG_LICENSE = GPLv2 +PKG_SUMMARY = Open Source Next Generation Intrusion Detection and Prevention Engine. + +PKG_BUILD_DEPS+= pkg-config +PKG_DEPS += libcap-ng libnfnetlink libnetfilter_queue libnet libpcap libyaml pcre + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +define PKG_DESCRIPTION + The suricata engine is not intended to just replace or emulate the \ + existing tools in the industry, but provides new ideas and \ + technologies. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --enable-gccprotect \ + --enable-nfqueue \ + --disable-static + +define STAGE_INSTALL_CMDS + -mkdir -pv $(BUILDROOT)/etc/logrotate.d/ + cp -vf $(DIR_SOURCE)/suricata.logrotate $(BUILDROOT)/etc/logrotate.d/$(PKG_NAME) +endef +

hooks/post-receive -- IPFire 3.x development tree