IPFire-SCM October 2010

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9493ba5445fac3640c2d9858064c1c127403fbf5
by git＠ipfire.org 07 Oct '10

07 Oct '10

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 9493ba5445fac3640c2d9858064c1c127403fbf5 (commit) via 9f359e81999bf939bfb1f31aa1a17e00580b3670 (commit) from 31e8c1b406a91139663464d86b8af860b67fb070 (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 9493ba5445fac3640c2d9858064c1c127403fbf5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 7 19:59:09 2010 +0200 naoki: Cleanup QA scripts. commit 9f359e81999bf939bfb1f31aa1a17e00580b3670 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 7 19:58:28 2010 +0200 naoki: Speed up dependency resolution. ----------------------------------------------------------------------- Summary of changes: naoki/packages.py | 9 +++++ tools/quality-agent.d/001-remove-info-files | 23 +++++++----- tools/quality-agent.d/001-remove-static-libs | 31 +++++++++------- tools/quality-agent.d/001-unsafe-files | 51 +++++++++++++++----------- tools/quality-agent.d/002-bad-symlinks | 42 ++++++++++++--------- tools/quality-agent.d/003-libs-location | 27 ++++++++------ tools/quality-agent.d/050-root-links-to-usr | 48 ++++++++++++++----------- tools/quality-agent.d/090-python-hardlinks | 23 +++++++----- tools/quality-agent.d/090-remove-empty-dirs | 22 ++++++----- tools/quality-agent.d/099-strip | 32 +++++++++------- 10 files changed, 177 insertions(+), 131 deletions(-) Difference in files: diff --git a/naoki/packages.py b/naoki/packages.py index 5c8e137..f38afec 100644 --- a/naoki/packages.py +++ b/naoki/packages.py @@ -236,6 +236,9 @@ class BinaryPackage(Package): key, val = m.groups() self._info[key] = val.strip("\"") + self.__dependencies = self.get_dependencies() + self.__provides = self.get_provides() + def extract(self, path): logging.debug("Extracting %s to %s" % (self, path)) @@ -261,6 +264,9 @@ class BinaryPackage(Package): return self._info["PKG_NAME"] def get_dependencies(self): + if hasattr(self, "__dependencies"): + return self.__dependencies + objects = self._info.get("PKG_DEPS", "").split() # Compatibility to older package format @@ -269,6 +275,9 @@ class BinaryPackage(Package): return [dependencies.Dependency(o, origin=self) for o in objects] def get_provides(self): + if hasattr(self, "__provides"): + return self.__provides + return [dependencies.Provides(p, origin=self) \ for p in self._info.get("PKG_PROVIDES", "").split()] diff --git a/tools/quality-agent.d/001-remove-info-files b/tools/quality-agent.d/001-remove-info-files index 131e55b..e742dc9 100755 --- a/tools/quality-agent.d/001-remove-info-files +++ b/tools/quality-agent.d/001-remove-info-files @@ -2,13 +2,16 @@ . $(dirname ${0})/qa-include -# Remove documentation files -log_debug "Removing documentation files..." -for dir in ${BUILDROOT}/usr/{,share}/{doc,gtk-doc,info}; do - if [ -d "${dir}" ]; then - log_debug " Removing: ${dir}" - rm -rf ${dir} || exit $? - fi -done - -exit 0 +DESC="Remove documentation files." + +function check() { + for dir in ${BUILDROOT}/usr/{,share}/{doc,gtk-doc,info}; do + if [ -d "${dir}" ]; then + log DEBUG " Removing: ${dir}" + rm -rf ${dir} || exit $? + fi + done +} + +run + diff --git a/tools/quality-agent.d/001-remove-static-libs b/tools/quality-agent.d/001-remove-static-libs index cbeabf2..e5c6e54 100755 --- a/tools/quality-agent.d/001-remove-static-libs +++ b/tools/quality-agent.d/001-remove-static-libs @@ -2,20 +2,23 @@ . $(dirname ${0})/qa-include -# Remove unwanted files -log_debug "Removing unwanted files: *.a *.la" -for file in $(find ${BUILDROOT} -name "*.a" -or -name "*.la"); do +DESC="Removing unwanted files: *.a *.la" + +function check() { + for file in $(find ${BUILDROOT} -name "*.a" -or -name "*.la"); do - # Don't remove libc_nonshared.a. It is used by gcc/ld. - [ "${file##*/}" = "libc_nonshared.a" ] && continue - [ "${file##*/}" = "libpthread_nonshared.a" ] && continue - [ "${file##*/}" = "libgcc.a" ] && continue - [ "${file##*/}" = "libgcc_eh.a" ] && continue - [ "${file##*/}" = "libfl_pic.a" ] && continue - [ "${file##*/}" = "libpython2.6.a" ] && continue + # Don't remove libc_nonshared.a. It is used by gcc/ld. + [ "${file##*/}" = "libc_nonshared.a" ] && continue + [ "${file##*/}" = "libpthread_nonshared.a" ] && continue + [ "${file##*/}" = "libgcc.a" ] && continue + [ "${file##*/}" = "libgcc_eh.a" ] && continue + [ "${file##*/}" = "libfl_pic.a" ] && continue + [ "${file##*/}" = "libpython2.6.a" ] && continue - log_debug " Removing: ${file}" - rm -f ${file} || exit $? -done + log DEBUG " Removing: ${file}" + rm -f ${file} || exit $? + done +} + +run -exit 0 diff --git a/tools/quality-agent.d/001-unsafe-files b/tools/quality-agent.d/001-unsafe-files index 547a1b1..93a5dc8 100755 --- a/tools/quality-agent.d/001-unsafe-files +++ b/tools/quality-agent.d/001-unsafe-files @@ -2,25 +2,32 @@ . $(dirname ${0})/qa-include -log_debug "Searching for world-writeable files..." - -files=$(find ${BUILDROOT} -type f -perm -2 2>/dev/null) -if [ -n "${files}" ]; then - log_error " QA Security Notice:" - log_error " - The folloing files will be world writable." - log_error " - This may or may not be a security problem, most of the time it is one." - log_error " - Please double check that these files really need a world writeable bit and file bugs accordingly." - log_error - log_error "${files}" - exit 1 -fi - -files=$(find ${BUILDROOT} -type f '(' -perm -2002 -o -perm -4002 ')') -if [ -n "${files}" ]; then - log_error " QA Notice: Unsafe files detected (set*id and world writable)" - log_error - log_error "${files}" - exit 1 -fi - -exit 0 +DESC="Searching for world-writeable files..." + +function check() { + local ret=0 + + local files=$(find ${BUILDROOT} -type f -perm -2 2>/dev/null) + if [ -n "${files}" ]; then + log ERROR " QA Security Notice:" + log ERROR " - The folloing files will be world writable." + log ERROR " - This may or may not be a security problem, most of the time it is one." + log ERROR " - Please double check that these files really need a world writeable bit and file bugs accordingly." + log ERROR + log ERROR "${files}" + ret=1 + fi + + files=$(find ${BUILDROOT} -type f '(' -perm -2002 -o -perm -4002 ')') + if [ -n "${files}" ]; then + log ERROR " QA Notice: Unsafe files detected (set*id and world writable)" + log ERROR + log ERROR "${files}" + ret=1 + fi + + return ${ret} +} + +run + diff --git a/tools/quality-agent.d/002-bad-symlinks b/tools/quality-agent.d/002-bad-symlinks index 7c8678f..595a7c5 100755 --- a/tools/quality-agent.d/002-bad-symlinks +++ b/tools/quality-agent.d/002-bad-symlinks @@ -7,21 +7,27 @@ log_debug "Search for absolute symlinks" -failed=0 -for link in $(find ${BUILDROOT} -type l); do - if fgrep -q "/lib/udev/devices" <<<${link}; then - continue - fi - - destination=$(readlink ${link}) - if [ "${destination:0:1}" = "/" ]; then - log_error " absolute symlink: ${link}" - failed=1 - fi - if [ ! -e "${link%/*}/${destination}" ]; then - log_error " not existant destination: ${link} -> ${destination}" - failed=1 - fi -done - -exit ${failed} +function check() { + local failed=0 + + for link in $(find ${BUILDROOT} -type l); do + if fgrep -q "/lib/udev/devices" <<<${link}; then + continue + fi + + destination=$(readlink ${link}) + if [ "${destination:0:1}" = "/" ]; then + log ERROR " Absolute symlink: ${link}" + failed=1 + fi + if [ ! -e "${link%/*}/${destination}" ]; then + log ERROR " Not existant destination: ${link} -> ${destination}" + failed=1 + fi + done + + return ${failed} +} + +run + diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location index 3d29bea..185f44f 100755 --- a/tools/quality-agent.d/003-libs-location +++ b/tools/quality-agent.d/003-libs-location @@ -2,19 +2,22 @@ . $(dirname ${0})/qa-include -# Check for libs that are missing in /usr/lib. +DESC="Checking correct installation of libraries" -log_debug "Checking correct installation of libraries" +function check() { + local failed=0 + for lib in $(find ${BUILDROOT}/lib -type f -name "lib*.so.*" 2>/dev/null); do + lib=${lib##*/} + lib=${lib%%.so*} -failed=0 -for lib in $(find ${BUILDROOT}/lib -type f -name "lib*.so.*" 2>/dev/null); do - lib=${lib##*/} - lib=${lib%%.so*} + if [ ! -e "${BUILDROOT}/usr/lib/${lib}.so" ]; then + log ERROR " /usr/lib/${lib}.so is missing" + failed=1 + fi + done - if [ ! -e "${BUILDROOT}/usr/lib/${lib}.so" ]; then - failed=1 - log_error " /usr/lib/${lib}.so is missing" - fi -done + return ${failed} +} + +run -exit ${failed} diff --git a/tools/quality-agent.d/050-root-links-to-usr b/tools/quality-agent.d/050-root-links-to-usr index 18b4d29..98385c5 100755 --- a/tools/quality-agent.d/050-root-links-to-usr +++ b/tools/quality-agent.d/050-root-links-to-usr @@ -2,24 +2,30 @@ . $(dirname ${0})/qa-include -log "Check for binaries in /bin or /sbin that link to /usr/..." - -for file in $(find ${BUILDROOT}/{bin,lib,sbin}/* 2>/dev/null); do - [ -f "${file}" ] || continue - log " ${file}" - - interpreter=$(file_get_interpreter ${file}) - if [ ! -e "${interpreter}" ]; then - log " SKIPPED because interpreter is not available" - continue - fi - - libs=$(ldd ${file}) - if grep -q /usr/lib <<<${libs}; then - log "ERROR: ${file} links to libs in /usr/lib..." - log " ${libs}" - exit 1 - fi -done - -exit 0 +DESC="Check for binaries in /bin or /sbin that link to /usr/..." + +function check() { + local ret=0 + + for file in $(find ${BUILDROOT}/{bin,lib,sbin}/* 2>/dev/null); do + [ -f "${file}" ] || continue + log DEBUG " ${file}" + + interpreter=$(file_get_interpreter ${file}) + if [ ! -e "${interpreter}" ]; then + log WARN " SKIPPED because interpreter is not available" + continue + fi + + libs=$(ldd ${file}) + if grep -q /usr/lib <<<${libs}; then + log ERROR "${file} links to libs in /usr/lib..." + log ERROR " ${libs}" + ret=1 + fi + done + + return ${ret} +} + +run diff --git a/tools/quality-agent.d/090-python-hardlinks b/tools/quality-agent.d/090-python-hardlinks index 8bcf6ea..e2abf76 100755 --- a/tools/quality-agent.d/090-python-hardlinks +++ b/tools/quality-agent.d/090-python-hardlinks @@ -2,16 +2,19 @@ . $(dirname ${0})/qa-include -# If the pyc and pyo files are the same, we can hardlink them -log "Hard-linking python bytecode files" +DESC="Python byte-code files could be hardlinked if the optimized one is equal" +DESC="${DESC} to the other one." -for py in $(find ${BUILDROOT} -type f -name "*.py"); do - if [ -e "${py}c" ] && [ -e "${py}o" ]; then - if cmp -s "${py}c" "${py}o"; then - log " ${py}c -> ${py}o" - ln -f "${py}c" "${py}o" +function check() { + for py in $(find ${BUILDROOT} -type f -name "*.py"); do + if [ -e "${py}c" ] && [ -e "${py}o" ]; then + if cmp -s "${py}c" "${py}o"; then + log DEBUG " ${py}c -> ${py}o" + ln -f "${py}c" "${py}o" + fi fi - fi -done + done +} + +run -exit 0 diff --git a/tools/quality-agent.d/090-remove-empty-dirs b/tools/quality-agent.d/090-remove-empty-dirs index de859ba..f8a39fd 100755 --- a/tools/quality-agent.d/090-remove-empty-dirs +++ b/tools/quality-agent.d/090-remove-empty-dirs @@ -2,15 +2,17 @@ . $(dirname ${0})/qa-include -# Remove unwanted files -log "Remove empty directories" +DESC="Remove unwanted files." -for dir in {,/usr}/{{,s}bin,lib{,exec}} /usr/share/man{,/man{0,1,2,3,4,5,6,7,8,9}}; do - dir="${BUILDROOT}/${dir}" - if [ -d "${dir}" ] && [ "$(ls -1A ${dir} | wc -l)" = "0" ]; then - log " Removing ${dir}" - rm -rf ${dir} - fi -done +function check() { + for dir in {,/usr}/{{,s}bin,lib{,exec}} /usr/share/man{,/man{0,1,2,3,4,5,6,7,8,9}}; do + dir="${BUILDROOT}/${dir}" + if [ -d "${dir}" ] && [ "$(ls -1A ${dir} | wc -l)" = "0" ]; then + log DEBUG " Removing ${dir}" + rm -rf ${dir} + fi + done +} + +run -exit 0 diff --git a/tools/quality-agent.d/099-strip b/tools/quality-agent.d/099-strip index 6afc8ad..f79b9a3 100755 --- a/tools/quality-agent.d/099-strip +++ b/tools/quality-agent.d/099-strip @@ -2,19 +2,23 @@ . $(dirname ${0})/qa-include -# Strip debugging symbols -log "Strip debugging symbols" -for f in $(find ${BUILDROOT} -type f $ -perm -0100 -or -perm -0010 -or -perm -0001 $); do - if (file $f | grep -q ' shared object,'); then - strip --strip-debug "$f" || : - fi -done +DESC="Stripping reduces size of binary files." -log "Strip unneeded symbols" -for f in $(find ${BUILDROOT} -type f); do - if (file $f | grep -q ' shared object,'); then - strip --strip-unneeded "$f" || : - fi -done +function check() { + # Strip debugging symbols + for f in $(find ${BUILDROOT} -type f $ -perm -0100 -or -perm -0010 -or -perm -0001 $); do + if (file $f | grep -q ' shared object,'); then + strip --strip-debug "$f" || : + fi + done + + log "Strip unneeded symbols" + for f in $(find ${BUILDROOT} -type f); do + if (file $f | grep -q ' shared object,'); then + strip --strip-unneeded "$f" || : + fi + done +} + +run -exit 0 hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5ea81cd5309792d112294627a74ae295645d69cb
by git＠ipfire.org 06 Oct '10

06 Oct '10

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 2.x development tree". The branch, next has been updated via 5ea81cd5309792d112294627a74ae295645d69cb (commit) via 650b057076a8cfe7f6987573a866911472a26c08 (commit) via 52b0f81319522ecb780465ca69a8d319415bb4eb (commit) via a3db3cc9f6104eca3cc78c5b1b8118576b8b9b95 (commit) from 79524818a2a788aa34ce6478b79584a50602198a (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 5ea81cd5309792d112294627a74ae295645d69cb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 6 18:38:39 2010 +0200 Updated Kernel (2.6.32.24). commit 650b057076a8cfe7f6987573a866911472a26c08 Merge: 7952481 52b0f81 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 6 18:38:27 2010 +0200 Merge commit 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/guardian/guardian.pl | 2 +- config/rootfiles/core/test/update.sh | 2 +- lfs/guardian | 2 +- lfs/linux | 6 +++--- src/paks/linux-xen/install.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl index 8c2e3b7..0c37c34 100644 --- a/config/guardian/guardian.pl +++ b/config/guardian/guardian.pl @@ -94,7 +94,7 @@ for (;;) { while (<ALERT2>) { chop; if ($_=~/.*sshd.*Failed password for root from.*/) { - my @array=split(/ /,$_);&checkssh ($array[10], "possible SSH-Bruteforce Attack");} + my @array=split(/ /,$_);&checkssh ($array[11], "possible SSH-Bruteforce Attack");} } } diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh index 1c24afe..078e503 100644 --- a/config/rootfiles/core/test/update.sh +++ b/config/rootfiles/core/test/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.23" +KVER="2.6.32.24" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/guardian b/lfs/guardian index 65f14cb..6cec09b 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -30,7 +30,7 @@ THISAPP = guardian-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 5 +PAK_VER = 6 DEPS = "" diff --git a/lfs/linux b/lfs/linux index 70022d0..259f888 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .23 -VER = 2.6.32.23 +PATCHLEVEL = .24 +VER = 2.6.32.24 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -64,7 +64,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2 -$(DL_FILE)_MD5 = f9fbeb2fc55fc41e5e7df16563d33ad1 +$(DL_FILE)_MD5 = bcd2f2b3d6974a9232b9becee8196634 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 5092923..4457e5e 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.23 +KVER=2.6.32.24 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 52b0f81319522ecb780465ca69a8d319415bb4eb
by git＠ipfire.org 05 Oct '10

05 Oct '10

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 2.x development tree". The branch, master has been updated via 52b0f81319522ecb780465ca69a8d319415bb4eb (commit) via a3db3cc9f6104eca3cc78c5b1b8118576b8b9b95 (commit) from f63935b14af95fdeb2ae0324f4e8ddecd9c495c1 (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 52b0f81319522ecb780465ca69a8d319415bb4eb Merge: a3db3cc f63935b Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Tue Oct 5 21:32:29 2010 +0200 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit a3db3cc9f6104eca3cc78c5b1b8118576b8b9b95 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Tue Oct 5 21:32:07 2010 +0200 Fixed Guardian ssh log parsing. ----------------------------------------------------------------------- Summary of changes: config/guardian/guardian.pl | 2 +- lfs/guardian | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl index 8c2e3b7..0c37c34 100644 --- a/config/guardian/guardian.pl +++ b/config/guardian/guardian.pl @@ -94,7 +94,7 @@ for (;;) { while (<ALERT2>) { chop; if ($_=~/.*sshd.*Failed password for root from.*/) { - my @array=split(/ /,$_);&checkssh ($array[10], "possible SSH-Bruteforce Attack");} + my @array=split(/ /,$_);&checkssh ($array[11], "possible SSH-Bruteforce Attack");} } } diff --git a/lfs/guardian b/lfs/guardian index 65f14cb..6cec09b 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -30,7 +30,7 @@ THISAPP = guardian-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 5 +PAK_VER = 6 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 31e8c1b406a91139663464d86b8af860b67fb070
by git＠ipfire.org 02 Oct '10

02 Oct '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1added9123c8acfa0c12a5f5cd716adb40666a1a
by git＠ipfire.org 02 Oct '10

02 Oct '10

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(a)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(a)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(a)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(a)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(a)ipfire.org> Date: Sat Oct 2 20:27:14 2010 +0200 Merge remote branch 'stevee/xterm' into next commit 70451f7e4ab0da7c20290e479434c46d3db05c75 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 2 15:53:19 2010 +0200 xterm: New package. commit 8f11397dcfa0a597589a1bb1af783bf04c8bf753 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 2 15:53:02 2010 +0200 libXaw: New package. commit 833e8385aaec850ec8715f110c50f8787b96e4f9 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 2 15:52:48 2010 +0200 libXpm: New package. commit 88def249bf995f994edbf353fd6eb97991afeb1e Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 2 15:52:32 2010 +0200 libXft: New package. commit 9ad440ffcb6eb70a6785bfd8857b7d2e8b039a9e Author: Schantl Stefan <Stevee(a)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(a)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(a)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(a)ipfire.org> Date: Fri Oct 1 11:24:00 2010 +0200 dos2unix: New package. commit f3e6a54f91bc7ab1405a642e55731a2e0103ab82 Author: Michael Tremer <michael.tremer(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM October 2010