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 3b39cb04ade75a7d40dffec2e54dd198f8950a0e (commit) via f245702ec547699e98406914b21ad8dc04fb8da6 (commit) via c8b6bccf2576a277a49e765a668578863190b5ba (commit) via 49a248c288d78784dec97246833a4876040c1752 (commit) via 5b177707516a9dd3cf4155a68e749c5cb88e09c9 (commit) via 9569b02f6af82bab87f158386d998b69834a3c34 (commit) via e931ca48649061d7c9d1fd62135b12a553cb8596 (commit) via 3bac5da8628aba75f42ac528779199ac2db843e2 (commit) via 34335c289fcaaaf5da0123227d2ba83fca87d466 (commit) via 7f7c44c88f371fb1c692e5affe5d548352e1fcb1 (commit) from fdeadc4798175713d665deeada69cdc132a8ecb0 (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 3b39cb04ade75a7d40dffec2e54dd198f8950a0e Merge: f245702 3bac5da Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 7 22:52:23 2011 +0100
Merge remote-tracking branch 'arne_f/wget'
commit f245702ec547699e98406914b21ad8dc04fb8da6 Merge: c8b6bcc 9569b02 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 7 22:52:19 2011 +0100
Merge remote-tracking branch 'arne_f/samba-update'
commit c8b6bccf2576a277a49e765a668578863190b5ba Merge: 49a248c 34335c2 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 7 22:52:15 2011 +0100
Merge remote-tracking branch 'arne_f/python-update'
commit 49a248c288d78784dec97246833a4876040c1752 Merge: 5b17770 7f7c44c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 7 22:52:12 2011 +0100
Merge remote-tracking branch 'arne_f/perl-update'
commit 5b177707516a9dd3cf4155a68e749c5cb88e09c9 Merge: fdeadc4 e931ca4 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 7 22:52:07 2011 +0100
Merge remote-tracking branch 'arne_f/elinks'
commit 9569b02f6af82bab87f158386d998b69834a3c34 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 7 10:10:52 2011 +0100
samba: update to 3.5.8.
commit e931ca48649061d7c9d1fd62135b12a553cb8596 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 7 08:54:42 2011 +0100
New package: elinks (0.11.7).
commit 3bac5da8628aba75f42ac528779199ac2db843e2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 7 08:32:33 2011 +0100
New package: wget (1.12).
commit 34335c289fcaaaf5da0123227d2ba83fca87d466 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 6 22:43:47 2011 +0100
Updated python (2.7.1).
commit 7f7c44c88f371fb1c692e5affe5d548352e1fcb1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Mar 6 22:26:27 2011 +0100
Updated perl (5.12.3).
-----------------------------------------------------------------------
Summary of changes: pkgs/{paxctl/paxctl.nm => elinks/elinks.nm} | 24 +++--- pkgs/perl/perl.nm | 4 +- .../patches/python-2.7rc1-ctypes-noexecmem.patch | 85 -------------------- pkgs/python/python.nm | 4 +- pkgs/samba/samba.nm | 4 +- pkgs/{pyfire/pyfire.nm => wget/wget.nm} | 31 ++++---- 6 files changed, 32 insertions(+), 120 deletions(-) copy pkgs/{paxctl/paxctl.nm => elinks/elinks.nm} (76%) delete mode 100644 pkgs/python/patches/python-2.7rc1-ctypes-noexecmem.patch copy pkgs/{pyfire/pyfire.nm => wget/wget.nm} (72%)
Difference in files: diff --git a/pkgs/elinks/elinks.nm b/pkgs/elinks/elinks.nm new file mode 100644 index 0000000..e7d018b --- /dev/null +++ b/pkgs/elinks/elinks.nm @@ -0,0 +1,46 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# # +# 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 = elinks +PKG_VER = 0.11.7 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Applications/Internet +PKG_URL = http://elinks.or.cz/ +PKG_LICENSE = GPLv2 +PKG_SUMMARY = Full-Featured Text WWW Browser. + +PKG_BUILD_DEPS+= gdbm-devel + +define PKG_DESCRIPTION + ELinks is an advanced and well-established feature-rich text mode \ + web (HTTP/FTP/..) browser. ELinks can render both frames and tables, \ + is highly customizable and can be extended via Lua or Guile scripts. \ + It is quite portable and runs on a variety of platforms. +endef + +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/perl/perl.nm b/pkgs/perl/perl.nm index 16145f2..c9a8cec 100644 --- a/pkgs/perl/perl.nm +++ b/pkgs/perl/perl.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = perl -PKG_VER = 5.12.2 -PKG_REL = 1 +PKG_VER = 5.12.3 +PKG_REL = 2
PKG_MAINTAINER = PKG_GROUP = Development/Languages diff --git a/pkgs/python/patches/python-2.7rc1-ctypes-noexecmem.patch b/pkgs/python/patches/python-2.7rc1-ctypes-noexecmem.patch deleted file mode 100644 index ccc2e68..0000000 --- a/pkgs/python/patches/python-2.7rc1-ctypes-noexecmem.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -up Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux Python-2.7rc1/Modules/_ctypes/callbacks.c ---- Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7rc1/Modules/_ctypes/callbacks.c 2010-06-08 08:44:18.357366200 -0400 -@@ -21,8 +21,8 @@ CThunkObject_dealloc(PyObject *_self) - Py_XDECREF(self->converters); - Py_XDECREF(self->callable); - Py_XDECREF(self->restype); -- if (self->pcl) -- _ctypes_free_closure(self->pcl); -+ if (self->pcl_write) -+ ffi_closure_free(self->pcl_write); - PyObject_GC_Del(self); - } - -@@ -391,7 +391,8 @@ static CThunkObject* CThunkObject_new(Py - return NULL; - } - -- p->pcl = NULL; -+ p->pcl_exec = NULL; -+ p->pcl_write = NULL; - memset(&p->cif, 0, sizeof(p->cif)); - p->converters = NULL; - p->callable = NULL; -@@ -421,8 +422,9 @@ CThunkObject *_ctypes_alloc_callback(PyO - - assert(CThunk_CheckExact(p)); - -- p->pcl = _ctypes_alloc_closure(); -- if (p->pcl == NULL) { -+ p->pcl_write = ffi_closure_alloc(sizeof(ffi_closure), -+ &p->pcl_exec); -+ if (p->pcl_write == NULL) { - PyErr_NoMemory(); - goto error; - } -@@ -467,7 +469,9 @@ CThunkObject *_ctypes_alloc_callback(PyO - "ffi_prep_cif failed with %d", result); - goto error; - } -- result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); -+ result = ffi_prep_closure_loc(p->pcl_write, &p->cif, closure_fcn, -+ p, -+ p->pcl_exec); - if (result != FFI_OK) { - PyErr_Format(PyExc_RuntimeError, - "ffi_prep_closure failed with %d", result); -diff -up Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux Python-2.7rc1/Modules/_ctypes/_ctypes.c ---- Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7rc1/Modules/_ctypes/_ctypes.c 2010-06-07 23:19:39.950146038 -0400 -@@ -3463,7 +3463,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObj - self->callable = callable; - - self->thunk = thunk; -- *(void **)self->b_ptr = (void *)thunk->pcl; -+ *(void **)self->b_ptr = (void *)thunk->pcl_exec; - - Py_INCREF((PyObject *)thunk); /* for KeepRef */ - if (-1 == KeepRef((CDataObject *)self, 0, (PyObject *)thunk)) { -diff -up Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux Python-2.7rc1/Modules/_ctypes/ctypes.h ---- Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7rc1/Modules/_ctypes/ctypes.h 2010-06-07 23:19:39.950146038 -0400 -@@ -95,7 +95,8 @@ struct tagCDataObject { - - typedef struct { - PyObject_VAR_HEAD -- ffi_closure *pcl; /* the C callable */ -+ ffi_closure *pcl_write; /* the C callable, writeable */ -+ void *pcl_exec; /* the C callable, executable */ - ffi_cif cif; - int flags; - PyObject *converters; -diff -up Python-2.7rc1/setup.py.selinux Python-2.7rc1/setup.py ---- Python-2.7rc1/setup.py.selinux 2010-06-07 23:19:39.922147795 -0400 -+++ Python-2.7rc1/setup.py 2010-06-07 23:19:39.951145942 -0400 -@@ -1864,8 +1864,7 @@ class PyBuildExt(build_ext): - '_ctypes/callbacks.c', - '_ctypes/callproc.c', - '_ctypes/stgdict.c', -- '_ctypes/cfield.c', -- '_ctypes/malloc_closure.c'] -+ '_ctypes/cfield.c'] - depends = ['_ctypes/ctypes.h'] - - if sys.platform == 'darwin': diff --git a/pkgs/python/python.nm b/pkgs/python/python.nm index 77028b7..59a2d3a 100644 --- a/pkgs/python/python.nm +++ b/pkgs/python/python.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = Python -PKG_VER = 2.7 -PKG_REL = 2 +PKG_VER = 2.7.1 +PKG_REL = 3
PKG_MAINTAINER = PKG_GROUP = Development/Languages diff --git a/pkgs/samba/samba.nm b/pkgs/samba/samba.nm index f419eec..eaa00b2 100644 --- a/pkgs/samba/samba.nm +++ b/pkgs/samba/samba.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include
PKG_NAME = samba -PKG_VER = 3.5.6 -PKG_REL = 0 +PKG_VER = 3.5.8 +PKG_REL = 1
PKG_MAINTAINER = Christian Schmidt christian.schmidt@ipfire.org PKG_GROUP = Networking/Daemons diff --git a/pkgs/wget/wget.nm b/pkgs/wget/wget.nm new file mode 100644 index 0000000..3efc006 --- /dev/null +++ b/pkgs/wget/wget.nm @@ -0,0 +1,50 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# # +# 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 = wget +PKG_VER = 1.12 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Applications/Internet +PKG_URL = http://www.gnu.org/software/wget/ +PKG_LICENSE = GPLv3+ +PKG_SUMMARY = Commandline tool to download files. + +define PKG_DESCRIPTION + GNU Wget is a free software package for retrieving files using \ + HTTP, HTTPS and FTP, the most widely-used Internet protocols. \ + It is a non-interactive commandline tool, so it may easily be \ + called from scripts, cron jobs, terminals without X-Windows \ + support, etc. +endef + +PKG_BUILD_DEPS+= perl-Pod-Simple perl-Pod-Escapes + +PKG_TARBALL = $(THISAPP).tar.lzma + +CONFIGURE_OPTIONS+= \ + --sysconfdir=/etc
hooks/post-receive -- IPFire 3.x development tree