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 1added9123c8acfa0c12a5f5cd716adb40666a1a (commit) via 03ddbd5b9d3be13337e5b302f68c48ed00de930a (commit) via 253346cc465e476161674d92bd8b0e9dcc839682 (commit) via dbfa9e6b083c743eaa32b3d3a0c4241327d694e0 (commit) via 5c3d39e18c18c4ff138630996faa73089d06e3ac (commit) via 70451f7e4ab0da7c20290e479434c46d3db05c75 (commit) via 8f11397dcfa0a597589a1bb1af783bf04c8bf753 (commit) via 833e8385aaec850ec8715f110c50f8787b96e4f9 (commit) via 88def249bf995f994edbf353fd6eb97991afeb1e (commit) via 9ad440ffcb6eb70a6785bfd8857b7d2e8b039a9e (commit) via 30ed53445c2349a2098ec3b796ea9b6c4fa7323e (commit) via 5a3105745705f412b8409523f37fd5f32c6ba83b (commit) via 73d58d04265ed28e95730232ad2ea73f745fd07c (commit) via f3e6a54f91bc7ab1405a642e55731a2e0103ab82 (commit) via bd15364ebd87dc7a90fec39c351a6ada1970d0ee (commit) via 8eb4b97130a3fa725ef7a5b3e683496c86cf1297 (commit) via e35eb77b0a94ee6c3706b619649432c1e24f48e4 (commit) from 5bb1864c7cc2e46b2a359ca690e0eca6d92defe0 (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 1added9123c8acfa0c12a5f5cd716adb40666a1a Merge: 03ddbd5 5a31057 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 2 20:30:23 2010 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next

commit 03ddbd5b9d3be13337e5b302f68c48ed00de930a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 2 20:29:31 2010 +0200

python: Add patch fix segfault in ctypes.so.

commit 253346cc465e476161674d92bd8b0e9dcc839682 Merge: dbfa9e6 9ad440f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 2 20:28:53 2010 +0200

Merge remote branch 'stevee/x-fixes' into next

commit dbfa9e6b083c743eaa32b3d3a0c4241327d694e0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 2 13:09:23 2010 +0200

python-parted: Add dependency to python-decorator.

commit 5c3d39e18c18c4ff138630996faa73089d06e3ac Merge: 73d58d0 70451f7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 2 20:27:14 2010 +0200

Merge remote branch 'stevee/xterm' into next

commit 70451f7e4ab0da7c20290e479434c46d3db05c75 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 2 15:53:19 2010 +0200

xterm: New package.

commit 8f11397dcfa0a597589a1bb1af783bf04c8bf753 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 2 15:53:02 2010 +0200

libXaw: New package.

commit 833e8385aaec850ec8715f110c50f8787b96e4f9 Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 2 15:52:48 2010 +0200

libXpm: New package.

commit 88def249bf995f994edbf353fd6eb97991afeb1e Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 2 15:52:32 2010 +0200

libXft: New package.

commit 9ad440ffcb6eb70a6785bfd8857b7d2e8b039a9e Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 2 14:14:58 2010 +0200

xorg-x11-server: Add xorg-x11-fonts and xorg-x11-font-utils as runtime dependency.

commit 30ed53445c2349a2098ec3b796ea9b6c4fa7323e Author: Schantl Stefan Stevee@ipfire.org Date: Sat Oct 2 13:03:05 2010 +0200

xorg-x11-server: Add mesa as runtime dependency.

This libraries are necessary for dri, dri2 and glx support of the Xorg server.

commit 5a3105745705f412b8409523f37fd5f32c6ba83b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 1 11:59:46 2010 +0200

lighttpd: Update to 1.4.28.

Fixes #47.

commit 73d58d04265ed28e95730232ad2ea73f745fd07c Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 1 11:24:00 2010 +0200

dos2unix: New package.

commit f3e6a54f91bc7ab1405a642e55731a2e0103ab82 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 30 22:16:29 2010 +0200

xorg-x11-server: Remove SUID bits and add posix capabilities.

commit bd15364ebd87dc7a90fec39c351a6ada1970d0ee Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 30 22:02:13 2010 +0200

shadow: Remove SUIDs bits and add posix capabilities.

commit 8eb4b97130a3fa725ef7a5b3e683496c86cf1297 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 30 21:41:37 2010 +0200

naoki: Fix generation of iso.

There were some issues with the sizes that were passed to the truncate commands. Additionally, there is no respare working yet.

commit e35eb77b0a94ee6c3706b619649432c1e24f48e4 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 30 21:39:21 2010 +0200

coreutils: Remove SUID bit from su and add capabilities.

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

Summary of changes: pkgs/core/coreutils/coreutils.nm | 6 +- .../pychecker.nm => dos2unix/dos2unix.nm} | 26 +++--- pkgs/core/{libXvMC/libXvMC.nm => libXaw/libXaw.nm} | 10 +- .../{libXrandr/libXrandr.nm => libXft/libXft.nm} | 10 +- .../{libXrandr/libXrandr.nm => libXpm/libXpm.nm} | 10 +- pkgs/core/lighttpd/lighttpd.nm | 4 +- pkgs/core/python-parted/python-parted.nm | 1 + .../patches/python-2.7rc1-ctypes-noexecmem.patch | 85 ++++++++++++++++++++ pkgs/core/python/python.nm | 2 +- pkgs/core/shadow/shadow.nm | 11 +++- pkgs/core/xorg-x11-server/xorg-x11-server.nm | 10 ++- pkgs/core/xterm/patches/xterm-245-resources.patch | 17 ++++ .../xterm/patches/xterm-256-man-page_paths.patch | 48 +++++++++++ pkgs/core/xterm/patches/xterm-261-desk.patch | 16 ++++ pkgs/core/{X11vnc/X11vnc.nm => xterm/xterm.nm} | 40 +++++----- tools/generator | 32 ++++++-- 16 files changed, 267 insertions(+), 61 deletions(-) copy pkgs/core/{pychecker/pychecker.nm => dos2unix/dos2unix.nm} (78%) copy pkgs/core/{libXvMC/libXvMC.nm => libXaw/libXaw.nm} (89%) copy pkgs/core/{libXrandr/libXrandr.nm => libXft/libXft.nm} (90%) copy pkgs/core/{libXrandr/libXrandr.nm => libXpm/libXpm.nm} (90%) create mode 100644 pkgs/core/python/patches/python-2.7rc1-ctypes-noexecmem.patch create mode 100644 pkgs/core/xterm/patches/xterm-245-resources.patch create mode 100644 pkgs/core/xterm/patches/xterm-256-man-page_paths.patch create mode 100644 pkgs/core/xterm/patches/xterm-261-desk.patch copy pkgs/core/{X11vnc/X11vnc.nm => xterm/xterm.nm} (72%)

Difference in files: diff --git a/pkgs/core/coreutils/coreutils.nm b/pkgs/core/coreutils/coreutils.nm index 5d5861d..6b82169 100644 --- a/pkgs/core/coreutils/coreutils.nm +++ b/pkgs/core/coreutils/coreutils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = coreutils PKG_VER = 8.5 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = System/Base @@ -74,4 +74,8 @@ define STAGE_INSTALL_CMDS # Dump /etc/DIR_COLORS dircolors -p > $(BUILDROOT)/etc/DIR_COLORS cp -vf $(DIR_SOURCE)/profile.d/* $(BUILDROOT)/etc/profile.d/ + + # Capabilities + chmod u-s $(BUILDROOT)/bin/su + setcap cap_setgid,cap_setuid+ep $(BUILDROOT)/bin/su endef diff --git a/pkgs/core/dos2unix/dos2unix.nm b/pkgs/core/dos2unix/dos2unix.nm new file mode 100644 index 0000000..1eaf170 --- /dev/null +++ b/pkgs/core/dos2unix/dos2unix.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 = dos2unix +PKG_VER = 5.1.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Applications/Text +PKG_URL = http://www.xs4all.nl/~waterlan/dos2unix.html +PKG_LICENSE = BSD +PKG_SUMMARY = Text file format converters. + +PKG_BUILD_DEPS+= gettext + +define PKG_DESCRIPTION + Convert text files with DOS or Mac line endings to Unix line endings and \ + vice versa. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && rm -rvf po/*/eo-x.* +endef + +define STAGE_BUILD + cd $(DIR_APP) && make $(PARALLELISMFLAGS) \ + CFLAGS="$(CFLAGS) -D_LARGEFILE_SOURCE $$(getconf LFS_CFLAGS)" +endef diff --git a/pkgs/core/libXaw/libXaw.nm b/pkgs/core/libXaw/libXaw.nm new file mode 100644 index 0000000..df80856 --- /dev/null +++ b/pkgs/core/libXaw/libXaw.nm @@ -0,0 +1,49 @@ +############################################################################### +# # +# 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 = libXaw +PKG_VER = 1.0.7 +PKG_REL = 0 + +PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X Athena Widget Set. + +PKG_BUILD_DEPS+= libX11-devel libXt-devel libXmu-devel libXpm-devel libXext-devel \ + pkg-config xorg-x11-proto-devel + +PKG_PACKAGES += $(PKG_NAME)-devel + +define PKG_DESCRIPTION + Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/libXft/libXft.nm b/pkgs/core/libXft/libXft.nm new file mode 100644 index 0000000..5f17ad9 --- /dev/null +++ b/pkgs/core/libXft/libXft.nm @@ -0,0 +1,49 @@ +############################################################################### +# # +# 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 = libXft +PKG_VER = 2.1.14 +PKG_REL = 0 + +PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 libXft runtime library. + +PKG_BUILD_DEPS+= fontconfig-devel freetype-devel libXrender-devel pkg-config \ + xorg-x11-proto-devel + +PKG_PACKAGES += $(PKG_NAME)-devel + +define PKG_DESCRIPTION + X.Org X11 libXft runtime library. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/libXpm/libXpm.nm b/pkgs/core/libXpm/libXpm.nm new file mode 100644 index 0000000..0736b88 --- /dev/null +++ b/pkgs/core/libXpm/libXpm.nm @@ -0,0 +1,49 @@ +############################################################################### +# # +# 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 = libXpm +PKG_VER = 3.5.8 +PKG_REL = 0 + +PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 libXpm runtime library. + +PKG_BUILD_DEPS+= gettext libXau-devel libXext-devel libXt-devel pkg-config \ + xorg-x11-proto-devel + +PKG_PACKAGES += $(PKG_NAME)-devel + +define PKG_DESCRIPTION + X.Org X11 libXpm runtime library. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/lighttpd/lighttpd.nm b/pkgs/core/lighttpd/lighttpd.nm index d4a506e..4d3f949 100644 --- a/pkgs/core/lighttpd/lighttpd.nm +++ b/pkgs/core/lighttpd/lighttpd.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = lighttpd -PKG_VER = 1.4.27 +PKG_VER = 1.4.28 PKG_REL = 0

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org @@ -46,7 +46,7 @@ define PKG_DESCRIPTION problems. endef

-PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.gz

CONFIGURE_OPTIONS += \ --libdir=/usr/lib/$(PKG_NAME) \ diff --git a/pkgs/core/python-parted/python-parted.nm b/pkgs/core/python-parted/python-parted.nm index f7b304e..978c577 100644 --- a/pkgs/core/python-parted/python-parted.nm +++ b/pkgs/core/python-parted/python-parted.nm @@ -35,6 +35,7 @@ PKG_LICENSE = GPLv2+ PKG_SUMMARY = Python module for GNU parted.

PKG_BUILD_DEPS+= parted-devel pkg-config python-decorator python-devel +PKG_DEPS += python-decorator

define PKG_DESCRIPTION Python module for the parted library. It is used for manipulating \ diff --git a/pkgs/core/python/patches/python-2.7rc1-ctypes-noexecmem.patch b/pkgs/core/python/patches/python-2.7rc1-ctypes-noexecmem.patch new file mode 100644 index 0000000..ccc2e68 --- /dev/null +++ b/pkgs/core/python/patches/python-2.7rc1-ctypes-noexecmem.patch @@ -0,0 +1,85 @@ +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/core/python/python.nm b/pkgs/core/python/python.nm index 44a60ae..75cab19 100644 --- a/pkgs/core/python/python.nm +++ b/pkgs/core/python/python.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = Python PKG_VER = 2.7 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = Development/Languages diff --git a/pkgs/core/shadow/shadow.nm b/pkgs/core/shadow/shadow.nm index 95be96a..022e6b5 100644 --- a/pkgs/core/shadow/shadow.nm +++ b/pkgs/core/shadow/shadow.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = shadow PKG_VER = 4.1.4.2 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = System/Base @@ -34,6 +34,8 @@ PKG_URL = ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = Utilities to deal with user accounts.

+PKG_BUILD_DEPS+= libcap + define PKG_DESCRIPTION The shadow-utils package includes the necessary programs \ for converting UNIX password files to the shadow password \ @@ -69,4 +71,11 @@ endef define STAGE_INSTALL_CMDS # Remove man pages in other languages rm -rfv $(BUILDROOT)/usr/share/man/{cs,de,fi,fr,hu,id,it,ja,pl,pt_BR,ru,sv,tr} + + # Capabilities + chmod u-s $(BUILDROOT)/usr/bin/chage + setcap cap_dac_read_search+ep $(BUILDROOT)/usr/bin/chage + + chmod u-s $(BUILDROOT)/usr/bin/newgrp + setcap cap_dac_override,cap_setgid+ep $(BUILDROOT)/usr/bin/newgrp endef diff --git a/pkgs/core/xorg-x11-server/xorg-x11-server.nm b/pkgs/core/xorg-x11-server/xorg-x11-server.nm index dec6412..a4cac9c 100644 --- a/pkgs/core/xorg-x11-server/xorg-x11-server.nm +++ b/pkgs/core/xorg-x11-server/xorg-x11-server.nm @@ -34,13 +34,14 @@ PKG_URL = http://www.x.org PKG_LICENSE = MIT PKG_SUMMARY = X.Org X11 X server.

-PKG_BUILD_DEPS+= autoconf automake libX11-devel libXau-devel libXdmcp-devel\ +PKG_BUILD_DEPS+= autoconf automake libcap libX11-devel libXau-devel libXdmcp-devel\ libXext-devel libXfixes-devel libXfont-devel libXmu-devel libXrender-devel\ libXres-devel libXt-devel libdrm-devel libfontenc-devel libpciaccess-devel\ libtool libudev-devel libxcb-devel libxkbfile-devel mesa-devel pixman-devel\ pkg-config xorg-x11-font-utils-devel xorg-x11-util-macros xorg-x11-proto-devel\ xorg-x11-xtrans-devel -PKG_DEPS += pixman udev xkeyboard-config xorg-x11-xkb-utils +PKG_DEPS += mesa pixman udev xkeyboard-config xorg-x11-fonts xorg-x11-font-utils \ + xorg-x11-xkb-utils

PKG_PACKAGES += $(PKG_NAME)-devel

@@ -123,4 +124,9 @@ define STAGE_INSTALL $(BUILDROOT)/usr/share/xorg/ cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/10-quirks.conf \ $(BUILDROOT)/usr/share/X11/xorg.conf.d + + # Capabilities + chmod u-s $(BUILDROOT)/usr/bin/Xorg + setcap cap_chown,cap_dac_override,cap_sys_rawio,cap_sys_admin+ep \ + $(BUILDROOT)/usr/bin/Xorg endef diff --git a/pkgs/core/xterm/patches/xterm-245-resources.patch b/pkgs/core/xterm/patches/xterm-245-resources.patch new file mode 100644 index 0000000..f3be10a --- /dev/null +++ b/pkgs/core/xterm/patches/xterm-245-resources.patch @@ -0,0 +1,17 @@ +diff -up xterm-245/XTerm.ad.resources xterm-245/XTerm.ad +--- xterm-245/XTerm.ad.resources 2009-02-13 01:14:13.000000000 +0100 ++++ xterm-245/XTerm.ad 2009-08-13 12:28:59.000000000 +0200 +@@ -210,3 +210,13 @@ + !*allowTcapOps: false + !*allowTitleOps: false + !*allowWindowOps: false ++ ++! Red Hat Defaults: ++*allowFontOps: false ++*allowTcapOps: false ++*allowWindowOps: false ++*VT100*eightBitInput: false ++*VT100*metaSendsEscape: true ++*VT100*backarrowKey: false ++*VT100*scrollBar: true ++*VT100*utf8Title: true diff --git a/pkgs/core/xterm/patches/xterm-256-man-page_paths.patch b/pkgs/core/xterm/patches/xterm-256-man-page_paths.patch new file mode 100644 index 0000000..6bfd46d --- /dev/null +++ b/pkgs/core/xterm/patches/xterm-256-man-page_paths.patch @@ -0,0 +1,48 @@ +diff -up xterm-256/minstall.sh.man-page_paths xterm-256/minstall.sh +--- xterm-256/minstall.sh.man-page_paths 2010-03-04 00:44:49.000000000 +0100 ++++ xterm-256/minstall.sh 2010-03-09 12:11:26.000000000 +0100 +@@ -109,6 +109,10 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME + X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*([^) ][^) ]*).*/\1/'` + test -z "$X_MANSECT" && X_MANSECT=$suffix + ++fontpath=/usr/share/X11/fonts ++xorgcfgdir=/etc/X11 ++xorgcfgfil=xorg.conf ++X_MANSECT=7 + sed -e 's%__vendorversion__%"X Window System"%' \ + -e s%__apploaddir__%$APPS_DIR% \ + -e s%__mansuffix__%$MY_MANSECT%g \ +@@ -117,6 +121,9 @@ sed -e 's%__vendorversion__%"X Window Sy + -e s%/etc/utmp%$UTMP_PATH%g \ + -e s%fIwtmp'\%fI'$WTMP_NAME'\%g' \ + -e s%/etc/wtmp%$WTMP_PATH%g \ ++ -e s%__fontpath__%$fontpath%g \ ++ -e s%__xorgcfgdir__%$xorgcfgdir%g \ ++ -e s%__xorgcfgfil__%$xorgcfgfil%g \ + $OLD_FILE >$NEW_FILE + + echo "$MINSTALL $OLD_FILE $END_FILE" +diff -up xterm-256/xterm.man.man-page_paths xterm-256/xterm.man +--- xterm-256/xterm.man.man-page_paths 2010-03-03 23:30:35.000000000 +0100 ++++ xterm-256/xterm.man 2010-03-09 12:11:26.000000000 +0100 +@@ -1699,17 +1699,17 @@ Since X11R6, bitmap fonts have been scal + The font server claims to provide the bold font that \fIxterm\fP requests, + but the result is not always readable. + XFree86 provides a feature which can be used to suppress the scaling. +-In the X server's configuration file (e.g., "/etc/X11/XFree86"), you ++In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you + can add ":unscaled" to the end of the directory specification for the + "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP. + For example + .RS +- FontPath "/usr/lib/X11/fonts/misc/" ++ FontPath "__fontpath__" + .RE + .IP + would become + .RS +- FontPath "/usr/lib/X11/fonts/misc/:unscaled" ++ FontPath "__fontpath__/misc/:unscaled" + .RE + .IP + Depending on your configuration, the font server may have its own configuration diff --git a/pkgs/core/xterm/patches/xterm-261-desk.patch b/pkgs/core/xterm/patches/xterm-261-desk.patch new file mode 100644 index 0000000..b648328 --- /dev/null +++ b/pkgs/core/xterm/patches/xterm-261-desk.patch @@ -0,0 +1,16 @@ +diff -up xterm-261/xterm.desktop.desk xterm-261/xterm.desktop +--- xterm-261/xterm.desktop.desk 2010-06-15 12:58:13.000000000 +0200 ++++ xterm-261/xterm.desktop 2010-07-02 13:02:56.000000000 +0200 +@@ -32,10 +32,11 @@ + # ----------------------------------------------------------------------------- + [Desktop Entry] + Name=XTerm ++GenericName=Terminal + Comment=standard terminal emulator for the X window system + Exec=xterm + Terminal=false + Type=Application + Encoding=UTF-8 +-Icon=xterm-color_48x48 ++Icon=gnome-xterm + Categories=System;TerminalEmulator; diff --git a/pkgs/core/xterm/xterm.nm b/pkgs/core/xterm/xterm.nm new file mode 100644 index 0000000..782f21f --- /dev/null +++ b/pkgs/core/xterm/xterm.nm @@ -0,0 +1,57 @@ +############################################################################### +# # +# 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 = xterm +PKG_VER = 262 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Application +PKG_URL = http://invisible-island.net/xterm/ +PKG_LICENSE = MIT +PKG_SUMMARY = Terminal emulator for the X Window System. + +PKG_BUILD_DEPS+= libXft-devel libXaw-devel libXext-devel libxkbfile-devel \ + pkg-config +PKG_DEPS += xorg-x11-server + +define PKG_DESCRIPTION + The xterm program is a terminal emulator for the X Window System. It \ + provides DEC VT102 and Tektronix 4014 compatible terminals for \ + programs that can't use the window system directly. +endef + +PKG_TARBALL = $(THISAPP).tgz + +CONFIGURE_OPTIONS += \ + --mandir=/usr/share/man \ + --enable-256-color \ + --enable-exec-xterm \ + --enable-luit \ + --enable-warnings \ + --enable-wide-chars \ + --with-tty-group=tty \ + --disable-full-tgetent diff --git a/tools/generator b/tools/generator index 9c615f7..89fdbfc 100755 --- a/tools/generator +++ b/tools/generator @@ -66,7 +66,7 @@ function _installer_image_osmin() { sparse=${tmp}/osmin sparse_loop=$(losetup -f)

- dd if=/dev/zero of=${sparse} bs=1 count=0 seek=64M + _ext3fs_sparse ${sparse} 128M losetup ${sparse_loop} ${sparse}

# Create a DM snapshot device... @@ -84,6 +84,7 @@ function _installer_image_osmin() { local cow_size=( $(dmsetup status | grep "^${name}") ) cow_size=${cow_size[4]} cow_size=$(awk -F"/" '{ print $1 }' <<<${cow_size}) + cow_size=$(( ${cow_size} * 512 ))

sleep 2 dmsetup remove ${name} @@ -120,6 +121,28 @@ function _ext3fs_resize() { resize2fs ${device} ${size} }

+function _ext3fs_sparse() { + local file=${1} + local size=${2} + + # Create a sparse disk with given size + dd if=/dev/zero of=${file} bs=1 count=0 seek=${size} +} + +function _ext3fs_resparse() { + local file=${1} + local device=${2} + + local size=$(stat --format="%s" ${file}) + + # Shrink FS to minimal size + _ext3fs_resize ${device} + truncate -s $(_ext3fs_bytes ${device}) ${file} + + _ext3fs_sparse ${file} ${size} + _ext3fs_resize ${device} ${size} +} + function _installer_image_ext3fs() { local file=${1} local dir=${2} @@ -129,7 +152,7 @@ function _installer_image_ext3fs() { mkdir -p $(dirname ${file}) 2>/dev/null

# Create a zeroed file - dd if=/dev/zero of=${file} bs=1 count=0 seek=${FSSIZE}G + _ext3fs_sparse ${file} ${FSSIZE}G

# Create a temporary directory # and get a free loop device @@ -153,9 +176,7 @@ function _installer_image_ext3fs() { cp -frp ${dir}/* ${tmp_dir} umount ${tmp_dir}

- # Shrink FS to minimal size - _ext3fs_resize ${loop} - truncate -s $(_ext3fs_blocks ${loop}) ${loop} + #_ext3fs_resparse ${file} ${loop}

losetup -d ${loop}

@@ -207,7 +228,6 @@ function install_kernel() { case "${1}" in iso) log DEBUG "Creating ISO image..." - set

ISO_DIR=$(mktemp -d) ISO_FILE=$(mktemp)

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