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 efd012369bee0e9a25e5f56c5b3483f6cfa261a6 (commit) via 9ecbd3d598a21a842571f9feff49ab3d240d8c87 (commit) via a21f47692132cc73fd5955bea29b81c6dada6cf4 (commit) via dc5ecc1c8ca4c530d8149e06e814f0208efb9139 (commit) via d4736bbff879f31d57f5640c3dceef89db04c40d (commit) via 3bbb55e956e1e560d4be0786fc73fb32fbb23d3a (commit) via faa88dd5aea2609795f226b27e64e8b3d84d6b53 (commit) via cde94f92e74a1241132e5c6f5ddb3c4d3f6463e8 (commit) via 83beae717f1309782938b77fce5cfa0b8d6eb622 (commit) via 83668e2850110bd67878e4aec38769f19b138317 (commit) via e81f5a327df7fc3cc5ba19b8013faf0328e16e61 (commit) via 89ced26ac3e8c65ff2c5b39f84677783f2237491 (commit) from b8b2278745bb2fe0a49aa9f8b3ff38d4592e4bfc (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 efd012369bee0e9a25e5f56c5b3483f6cfa261a6 Merge: 9ecbd3d dc5ecc1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 12 17:30:43 2011 +0100

Merge remote-tracking branch 'stevee/module-init-tools'

commit 9ecbd3d598a21a842571f9feff49ab3d240d8c87 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 12 16:46:35 2011 +0100

suricata: Fix identation in makefile.

commit a21f47692132cc73fd5955bea29b81c6dada6cf4 Merge: 3bbb55e d4736bb Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 12 16:46:17 2011 +0100

Merge remote-tracking branch 'maniacikarus/ids'

commit dc5ecc1c8ca4c530d8149e06e814f0208efb9139 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Nov 11 22:02:16 2011 +0100

module-init-tools: Remove conflicting file.

The /etc/modproble.d/blacklist.conf conflicted with the shipped of hwdata.

commit d4736bbff879f31d57f5640c3dceef89db04c40d Author: Christian Schmidt christian.schmidt@ipfire.org Date: Fri Nov 11 10:27:56 2011 +0000

suricata: Updated to stable 1.1

commit 3bbb55e956e1e560d4be0786fc73fb32fbb23d3a Merge: faa88dd 83beae7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Nov 10 23:31:23 2011 +0100

Merge remote-tracking branch 'maniacikarus/openvpn'

commit faa88dd5aea2609795f226b27e64e8b3d84d6b53 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Nov 10 23:30:23 2011 +0100

strongswan: Update to 4.6.1.

commit cde94f92e74a1241132e5c6f5ddb3c4d3f6463e8 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Nov 10 23:30:01 2011 +0100

MAKEDEV: New package.

commit 83beae717f1309782938b77fce5cfa0b8d6eb622 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Thu Nov 10 06:18:40 2011 +0000

openvpn: Updated to latest stable release.

commit 83668e2850110bd67878e4aec38769f19b138317 Author: Christian Schmidt christian.schmidt@iipfire.org Date: Tue Nov 8 17:29:46 2011 +0000

suricata: Fixed naoki file to match packages guides.

fixes #282

Wiiki enhanced with thisapp and description.

commit e81f5a327df7fc3cc5ba19b8013faf0328e16e61 Author: Christian Schmidt christian.schmidt@iipfire.org Date: Sat Nov 5 11:58:01 2011 +0000

oinkmaster: Changed arch and added config.

fixes #278 fixes #279

You can now use oinkmaster to download suricata rules from emerging site. You just need to issue oinkmaster.pl -o /etc/suricata/rules/

commit 89ced26ac3e8c65ff2c5b39f84677783f2237491 Author: Christian Schmidt christian.schmidt@iipfire.org Date: Sat Nov 5 11:32:16 2011 +0000

suricata: Update to rc1 and changed rule config directory.

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

Summary of changes: MAKEDEV/MAKEDEV.nm | 63 ++++++++++ MAKEDEV/makedev.d.5 | 180 +++++++++++++++++++++++++++ module-init-tools/modprobe.d/blacklist.conf | 38 ------ module-init-tools/module-init-tools.nm | 2 +- oinkmaster/oinkmaster.nm | 8 +- openvpn/openvpn.nm | 4 +- strongswan/strongswan.nm | 2 +- suricata/suricata.conf | 4 +- suricata/suricata.nm | 4 +- 9 files changed, 257 insertions(+), 48 deletions(-) create mode 100644 MAKEDEV/MAKEDEV.nm create mode 100644 MAKEDEV/makedev.d.5 delete mode 100644 module-init-tools/modprobe.d/blacklist.conf

Difference in files: diff --git a/MAKEDEV/MAKEDEV.nm b/MAKEDEV/MAKEDEV.nm new file mode 100644 index 0000000..7d82cab --- /dev/null +++ b/MAKEDEV/MAKEDEV.nm @@ -0,0 +1,63 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = MAKEDEV +version = 3.24 +release = 1 + +groups = System/Base +url = +license = GPLv2 +summary = A program used for creating device files in /dev. + +description + This package contains the MAKEDEV program, which makes it easier to create + and maintain the files in the /dev directory. /dev directory files + correspond to a particular device supported by Linux (serial or printer + ports, scanners, sound cards, tape drives, CD-ROM drives, hard drives, + etc.) and interface with the drivers in the kernel. + + You should install the MAKEDEV package because the MAKEDEV utility makes + it easy to manage the /dev directory device files. +end + +sources = %{thisapp}-1.tar.gz + +build + requires + libselinux-devel + end + + make_build_targets += OPTFLAGS="%{CFLAGS}" SELINUX=1 + make_install_targets += devdir=/dev makedevdir=/sbin + + install_cmds + rm -f %{BUILDROOT}/dev/MAKEDEV + mkdir -pv %{BUILDROOT}/usr/share/man/man5 + install -m 644 -p %{DIR_SOURCE}/makedev.d.5 \ + %{BUILDROOT}/usr/share/man/man5 + mkdir -pv %{BUILDROOT}/lib/udev/devices + ln -svf ../../../sbin/MAKEDEV \ + %{BUILDROOT}/lib/udev/devices/MAKEDEV + end +end + +packages + package %{name} + groups += Base + + prerequires = shadow-utils + requires += udev + + script prein + # Add the floopy group and the vcsa user. + getent group floppy >/dev/null || groupadd -g 19 -r -f floppy + getent group vcsa >/dev/null || groupadd -g 69 -r -f vcsa + getent passwd vcsa >/dev/null || \ + useradd -r -g vcsa -d /dev -s /sbin/nologin -u 69 \ + -c "virtual console memory owner" vcsa 2>/dev/null + end + end +end diff --git a/MAKEDEV/makedev.d.5 b/MAKEDEV/makedev.d.5 new file mode 100644 index 0000000..290334c --- /dev/null +++ b/MAKEDEV/makedev.d.5 @@ -0,0 +1,180 @@ +." Copyright (c) 2002 Thierry Vignaud tvignaud@mandrakesoft.com +." Copyright (c) 2010 Hans de Goede hdegoede@redhat.com +." +." This is free documentation; 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 2 of +." the License, or (at your option) any later version. +." +." The GNU General Public License's references to "object code" +." and "executables" are to be interpreted as the output of any +." document formatting or typesetting system, including +." intermediate and printed output. +." +." This manual 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 manual; if not, write to the Free +." Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, +." USA. +." +." +.TH makedev.d 5 "1 June 2010" "Red Hat Linux" "Linux System Administrator's Manual" +.SH NAME +makedev.d - configuration files for devices creation through MAKEDEV +.".SH SYNOPSIS +.SH DESCRIPTION +The behavior of +.B MAKEDEV +is instrumented by the configuration files in +.I /etc/makedev.d/ +directory. They're read and "executed" by +.BR MAKEDEV(8) +on post installation of the MAKEDEV package. +.PP +These configuration file consists of a set of lines. +.PP +All empty lines, and all text on a line after a '#', will be ignored. +.PP +The remaining lines should all conform to one of the following formats: +.SH SYNTAX +This is a description of the four basic legal directives. +.TP +.B =NAME expanded text +this define a macro. eg: +.I =BURNER 660 root cdwriter +will make +.B MAKEDEV +expand +.I $BURNER +when encountered. +.TP +.B b mask owner group major minor minor_step dev_number root_name base +this directive define some +.I block +(``b'') device(s) creation. They will be owned by +.I owner +and +.I group +and will have the +.I major +and +.I minor +as major and minor numbers. +.br +The +.I dev_number +arguments define how many devices will be created. If +.I dev_number +is different from 1, then +.I dev_number +devices will be created, their minor number being incremented by +.I minor_step +at each step. +.br +If only one device is created, it will be named \fIroot_name\fP. Else, +the devices will be named with regards to the following rules : +.RS 7 +.IP (bu +If +.I root_name +does not contains ``%d'', then ```\fI%d\fP'' is appended to its end. +.IP (bu +If +.I base +is not set, it is initialized to zero. +.IP (bu +Then, at each step, the name of the device we have to created is obtained +by incrementing +.I base +and replacing ``%d'' by \fI base\fP. This is equivament to these statements : +.NF +$base++; $file = sprintf($name, $base); +.FI +." If several devices have to be created and if +.RE +.TP +.B c mask owner group major minor minor_step dev_number root_name base +is quite the same directive as the previous one, exept its purpose is +.I character +devices (``c'') creation. +.TP +.B l destination source +will make +.B makdev +symlink +.I source +on \fIdestination\fP. +." .TP +." .B s mask owner group root_name +." will make +." .B makdev +." creating a node like the \fBb\fP and the \fBc\fP directives, but as a regular +." file with the sticky bit positionned. +.SH CUSTOMIZATION +Since there is currently no standardization in what names are used for +system users and groups, it is possible that you may need to modify +\fBMAKEDEV\fR's configuration files to reflect your site's settings. +.SH EXAMPLES +.RS +.sp +.nf +.ne 7 +# /etc/makedev.d/test sample +# + +# the following line create (```\fBc\fP'') the famous \fI/dev/null\fP entry +# with 666 mask (file access permissions), with 1 as major and +# 3 as minor +c 666 root root 1 3 1 1 null + + +# the following line define the STORAGE macro that specify a 660 +# mask for file permissions, root as owner and disk as group +=STORAGE 660 root disk + +# the following line create 16 \fI/dev/hdaX\fP entries (/dev/hda0 to +# /dev/hda15) with the permissions and ownership defined above, +# and with 22 as major +b $STORAGE 22 0 1 16 hda%d + +# this one link /dev/snd on alsa entry in procfs +# (usually mounted in /proc) +l snd ../proc/asound/dev +.fi +.sp +.RE +.PP +.SH NOTES +The name of the file may contain some ``\fI/\fP'' characters : +.B makdev +will create the necessary directories if the node to create must be +in a sub directory. +.br +Comments must begin on first line character. +.br +Files are parsed one by one, after having been sorted by name in alphabetical order. +.SH FILES +The +.IR /etc/makedev.d/* +files contains instructions that instrument +.B makdev +to create the device files in /dev. Especially, +.IR /etc/makedev.d/00macros +define most frequently used macros. +.SH "SEE ALSO" +Linux Allocated Devices +.br +It can be found in +.IR /usr/share/doc/kernel-doc-<VERSION>/Documentation/devices.txt +if the kernel-doc package is installed. <VERSION> is the version number +of the installed kernel (eg: 2.6.32). +.PP +.BR MAKEDEV (8) +.SH AUTHOR +.RI "Thierry Vignaud <" tvignaud@mandrakesoft.com ">, 2002" +.br +.RI "Hans de Goede <" hdegoede@redhat.com ">, 2010" diff --git a/module-init-tools/modprobe.d/blacklist.conf b/module-init-tools/modprobe.d/blacklist.conf deleted file mode 100644 index b393b22..0000000 --- a/module-init-tools/modprobe.d/blacklist.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Listing a module here prevents the hotplug scripts from loading it. -# Usually that'd be so that some other driver will bind it instead, -# no matter which driver happens to get probed first. Sometimes user -# mode tools can also control driver binding. -# -# Syntax: driver name alone (without any spaces) on a line. Other -# lines are ignored. -# - -# watchdog drivers -blacklist i8xx_tco - -# framebuffer drivers -blacklist aty128fb -blacklist atyfb -blacklist radeonfb -blacklist i810fb -blacklist cirrusfb -blacklist intelfb -blacklist kyrofb -blacklist i2c-matroxfb -blacklist hgafb -blacklist nvidiafb -blacklist rivafb -blacklist savagefb -blacklist sisfb -blacklist sstfb -blacklist neofb -blacklist tridentfb -blacklist tdfxfb -blacklist virgefb -blacklist vga16fb - -# ISDN - see bugs 154799, 159068 -blacklist hisax -blacklist hisax_fcpcipnp - diff --git a/module-init-tools/module-init-tools.nm b/module-init-tools/module-init-tools.nm index a260776..06d8f6e 100644 --- a/module-init-tools/module-init-tools.nm +++ b/module-init-tools/module-init-tools.nm @@ -5,7 +5,7 @@

name = module-init-tools version = 3.16 -release = 2 +release = 3

groups = System/Base url = http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/ diff --git a/oinkmaster/oinkmaster.nm b/oinkmaster/oinkmaster.nm index d920d7f..f9f5e6d 100644 --- a/oinkmaster/oinkmaster.nm +++ b/oinkmaster/oinkmaster.nm @@ -5,7 +5,8 @@

name = oinkmaster version = 2.0 -release = 1 +release = 2 +arch = noarch

groups = Development/Libraries url = http://oinkmaster.sourceforge.net @@ -24,12 +25,15 @@ build end

build - # Nothing to do here. + echo "url = http://rules.emergingthreats.net/open/suricata/emerging.rules.tar.gz" >> oinkmaster.conf + echo "tmpdir = /var/tmp/" >> oinkmaster.conf end

install mkdir -pv %{BUILDROOT}/usr/sbin install -m 755 oinkmaster.pl %{BUILDROOT}/usr/sbin + mkdir -pv %{BUILDROOT}/etc + install -m 644 oinkmaster.conf %{BUILDROOT}/etc end end

diff --git a/openvpn/openvpn.nm b/openvpn/openvpn.nm index 6da76f6..e126448 100644 --- a/openvpn/openvpn.nm +++ b/openvpn/openvpn.nm @@ -4,7 +4,7 @@ ###############################################################################

name = openvpn -version = 2.2-RC2 +version = 2.2.1 release = 1

groups = Networking/VPN @@ -20,7 +20,7 @@ description for compression. end

-source_dl = +source_dl = http://swupdate.openvpn.org/community/releases/

PLUGINS = auth-pam down-root

diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index 469264e..44286b6 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,7 +4,7 @@ ###############################################################################

name = strongswan -version = 4.6.0 +version = 4.6.1 release = 1

groups = Networking/VPN diff --git a/suricata/suricata.conf b/suricata/suricata.conf index 672a306..d1d5a25 100644 --- a/suricata/suricata.conf +++ b/suricata/suricata.conf @@ -1,7 +1,7 @@ %YAML 1.1 --- # Suricata Emergingthreats Pro Open Rulesets Recommended -reference-config-file: /etc/suricata/reference.config +reference-config-file: /etc/suricata/rules/reference.config

# Number of packets allowed to be processed simultaneously. Default is a # conservative 50. a higher number will make sure CPU's/CPU cores will be @@ -388,7 +388,7 @@ rule-files: # - emerging-tor.rules # - emerging-mobile_malware.rules

-classification-file: /etc/suricata/classification.config +classification-file: /etc/suricata/rules/classification.config

# Holds variables that would be used by the engine. vars: diff --git a/suricata/suricata.nm b/suricata/suricata.nm index 5de62ef..7c4cec5 100644 --- a/suricata/suricata.nm +++ b/suricata/suricata.nm @@ -4,8 +4,8 @@ ###############################################################################

name = suricata -version = 1.1beta3 -release = 5 +version = 1.1 +release = 1

groups = Networking/IDS url = http://www.openinfosecfoundation.org/

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