IPFire-SCM March 2011

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 81e51d58ddc66500dfd097e7f207d876bc0b5b48
by git＠ipfire.org 13 Mar '11

13 Mar '11

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 81e51d58ddc66500dfd097e7f207d876bc0b5b48 (commit) via 96efb1f9eb954262efa47cbf15ae8ba4d04eda5b (commit) via 25fd08ab923373d8f0db5b7cbe78c7fb34cbb840 (commit) via ddf4aae6c88195cf9a05f6f3823838d65895e01c (commit) via 03bb3da937d3a4d00d35424a638efef16a738c0e (commit) via 12cfac0b080ce2e2c84a9033f0230452093e18e4 (commit) via d852ef1f6cb0ff701afaf7fb42561a53c23ec923 (commit) via 729f3209d1969e70e6d754b3822d0fb5cafbf6d4 (commit) via c85a7472c9d6885f47a971fd285c4b25134d0037 (commit) from 592840da1cf41d21532062d60d6e35af8b3d38f8 (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 81e51d58ddc66500dfd097e7f207d876bc0b5b48 Merge: 96efb1f 592840d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 11 11:32:35 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 96efb1f9eb954262efa47cbf15ae8ba4d04eda5b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 17:00:42 2011 +0100 bash: Remove global startup files from this package. They are now in setup. commit 25fd08ab923373d8f0db5b7cbe78c7fb34cbb840 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 16:57:31 2011 +0100 build-essentials: Add setup package as dependency. commit ddf4aae6c88195cf9a05f6f3823838d65895e01c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 16:57:08 2011 +0100 basesystem: Add setup package as dependency. commit 03bb3da937d3a4d00d35424a638efef16a738c0e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 16:54:53 2011 +0100 setup: New package. commit 12cfac0b080ce2e2c84a9033f0230452093e18e4 Merge: d852ef1 795572b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 16:01:22 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit d852ef1f6cb0ff701afaf7fb42561a53c23ec923 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 13:00:49 2011 +0100 perl-URI: New package. commit 729f3209d1969e70e6d754b3822d0fb5cafbf6d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 11:33:49 2011 +0100 xz: Add -libs package. commit c85a7472c9d6885f47a971fd285c4b25134d0037 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 9 18:54:07 2011 +0100 wget: Remove two perl dependencies that were needed for build. Now they get resolved and added automatically. ----------------------------------------------------------------------- Summary of changes: pkgs/basesystem/basesystem.nm | 6 +- pkgs/bash/bash.nm | 4 +- pkgs/bash/shells | 7 - pkgs/build-essentials/build-essentials.nm | 4 +- .../perl-XML-Parser.nm => perl-URI/perl-URI.nm} | 28 ++--- pkgs/setup/Makefile | 6 + pkgs/setup/aliases | 96 ++++++++++++++ pkgs/{bash => setup}/bashrc | 37 +++--- pkgs/{vsftpd/vsftpd.user_list => setup/exports} | 0 pkgs/setup/filesystems | 8 ++ pkgs/setup/group | 23 ++++ pkgs/setup/host.conf | 2 + pkgs/setup/hosts | 2 + pkgs/setup/hosts.allow | 10 ++ pkgs/setup/hosts.deny | 13 ++ pkgs/setup/inputrc | 42 +++++++ pkgs/{vsftpd/vsftpd.user_list => setup/motd} | 0 pkgs/setup/passwd | 15 +++ pkgs/setup/printcap | 7 + pkgs/{bash => setup}/profile | 24 +++- pkgs/setup/securetty | 23 ++++ pkgs/{sysvinit/sysvinit.nm => setup/setup.nm} | 41 ++++--- pkgs/setup/shadowconvert.sh | 18 +++ pkgs/setup/shells | 3 + pkgs/setup/uidgid | 130 ++++++++++++++++++++ pkgs/setup/uidgidlint | 24 ++++ pkgs/wget/wget.nm | 2 +- pkgs/xz/xz.nm | 4 +- 28 files changed, 505 insertions(+), 74 deletions(-) delete mode 100644 pkgs/bash/shells copy pkgs/{perl-XML-Parser/perl-XML-Parser.nm => perl-URI/perl-URI.nm} (79%) create mode 100644 pkgs/setup/Makefile create mode 100644 pkgs/setup/aliases rename pkgs/{bash => setup}/bashrc (67%) copy pkgs/{vsftpd/vsftpd.user_list => setup/exports} (100%) create mode 100644 pkgs/setup/filesystems create mode 100644 pkgs/setup/group create mode 100644 pkgs/setup/host.conf create mode 100644 pkgs/setup/hosts create mode 100644 pkgs/setup/hosts.allow create mode 100644 pkgs/setup/hosts.deny create mode 100644 pkgs/setup/inputrc copy pkgs/{vsftpd/vsftpd.user_list => setup/motd} (100%) create mode 100644 pkgs/setup/passwd create mode 100644 pkgs/setup/printcap rename pkgs/{bash => setup}/profile (63%) create mode 100644 pkgs/setup/securetty copy pkgs/{sysvinit/sysvinit.nm => setup/setup.nm} (69%) create mode 100755 pkgs/setup/shadowconvert.sh create mode 100644 pkgs/setup/shells create mode 100644 pkgs/setup/uidgid create mode 100755 pkgs/setup/uidgidlint Difference in files: diff --git a/pkgs/basesystem/basesystem.nm b/pkgs/basesystem/basesystem.nm index da4b1e4..ccac75f 100644 --- a/pkgs/basesystem/basesystem.nm +++ b/pkgs/basesystem/basesystem.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = basesystem PKG_VER = $(DISTRO_VERSION) -PKG_REL = 1 +PKG_REL = 2 PKG_ARCH = noarch PKG_MAINTAINER = @@ -41,8 +41,8 @@ PKG_BUILD_DEPS = # There are no build dependencies # useable system. PKG_DEPS += /bin/sh /sbin/init \ coreutils file findutils gawk grep iana-etc initscripts kbd less \ - module-init-tools network pakfire passwd procps psmisc sed shadow \ - system-release tar udev util-linux-ng vim + module-init-tools network pakfire passwd procps psmisc sed setup \ + shadow system-release tar udev util-linux-ng vim define PKG_DESCRIPTION This package contains files that are needed to run basic \ diff --git a/pkgs/bash/bash.nm b/pkgs/bash/bash.nm index ee8ba6b..5a4fff2 100644 --- a/pkgs/bash/bash.nm +++ b/pkgs/bash/bash.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = bash PKG_VER = 4.2 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUP = System/Tools @@ -42,6 +42,7 @@ define PKG_DESCRIPTION endef PKG_BUILD_DEPS+= autoconf automake bison ncurses-devel readline-devel +PKG_DEPS += /etc/bashrc /etc/profile PKG_TARBALL = $(THISAPP).tar.gz @@ -71,7 +72,6 @@ define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/{bin,etc/profile.d,root} # Bash startup files - cp -avf $(DIR_SOURCE)/{bashrc,profile,shells} $(BUILDROOT)/etc cp -vf $(DIR_SOURCE)/dot_bash_logout $(BUILDROOT)/root/.bash_logout cp -vf $(DIR_SOURCE)/dot_bash_profile $(BUILDROOT)/root/.bash_profile cp -vf $(DIR_SOURCE)/dot_bashrc $(BUILDROOT)/root/.bashrc diff --git a/pkgs/bash/bashrc b/pkgs/bash/bashrc deleted file mode 100644 index 5afd453..0000000 --- a/pkgs/bash/bashrc +++ /dev/null @@ -1,85 +0,0 @@ -# /etc/bashrc - -# System wide functions and aliases -# Environment stuff goes in /etc/profile - -# It's NOT good idea to change this file unless you know what you -# are doing. Much better way is to create custom.sh shell script in -# /etc/profile.d/ to make custom changes to environment. This will -# prevent need for merging in future updates. - -# By default, we want this to get set. -# Even for non-interactive, non-login shells. -# Current threshold for system reserved uid/gids is 200 -# You could check uidgid reservation validity in -# /usr/share/doc/setup-*/uidgid file -if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then - umask 002 -else - umask 022 -fi - -# are we an interactive shell? -if [ "$PS1" ]; then - case $TERM in - xterm*) - if [ -e /etc/sysconfig/bash-prompt-xterm ]; then - PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm - else - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\007"' - fi - ;; - screen) - if [ -e /etc/sysconfig/bash-prompt-screen ]; then - PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen - else - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}"; echo -ne "\033\\"' - fi - ;; - *) - [ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default - ;; - esac - # Turn on checkwinsize - shopt -s checkwinsize - [ "$PS1" = "\\s-\\v\\\$ " ] && PS1="[\u@\h \W]\\$ " - # You might want to have e.g. tty in prompt (e.g. more virtual machines) - # and console windows - # If you want to do so, just add e.g. - # if [ "$PS1" ]; then - # PS1="[\u@\h:\l \W]\\$ " - # fi - # to your custom modification shell script in /etc/profile.d/ directory -fi - -if ! shopt -q login_shell ; then # We're not a login shell - # Need to redefine pathmunge, it get's undefined at the end of /etc/profile - pathmunge () { - case ":${PATH}:" in - *:"$1":*) - ;; - *) - if [ "$2" = "after" ] ; then - PATH=$PATH:$1 - else - PATH=$1:$PATH - fi - esac - } - - # Only display echos from profile.d scripts if we are no login shell - # and interactive - otherwise just process them to set envvars - for i in /etc/profile.d/*.sh; do - if [ -r "$i" ]; then - if [ "$PS1" ]; then - . $i - else - . $i >/dev/null 2>&1 - fi - fi - done - - unset i - unset pathmunge -fi -# vim:ts=4:sw=4 diff --git a/pkgs/bash/profile b/pkgs/bash/profile deleted file mode 100644 index d3a2bbc..0000000 --- a/pkgs/bash/profile +++ /dev/null @@ -1,68 +0,0 @@ -# /etc/profile - -# System wide environment and startup programs, for login setup -# Functions and aliases go in /etc/bashrc - -# It's NOT good idea to change this file unless you know what you -# are doing. Much better way is to create custom.sh shell script in -# /etc/profile.d/ to make custom changes to environment. This will -# prevent need for merging in future updates. - -pathmunge () { - case ":${PATH}:" in - *:"$1":*) - ;; - *) - if [ "$2" = "after" ] ; then - PATH=$PATH:$1 - else - PATH=$1:$PATH - fi - esac -} - - -if [ -x /usr/bin/id ]; then - if [ -z "$EUID" ]; then - # ksh workaround - EUID=`id -u` - UID=`id -ru` - fi - USER="`id -un`" - LOGNAME=$USER - MAIL="/var/spool/mail/$USER" -fi - -# Path manipulation -if [ "$EUID" = "0" ]; then - pathmunge /sbin - pathmunge /usr/sbin - pathmunge /usr/local/sbin -else - pathmunge /usr/local/sbin after - pathmunge /usr/sbin after - pathmunge /sbin after -fi - -HOSTNAME=`/bin/hostname 2>/dev/null` -HISTSIZE=1000 -if [ "$HISTCONTROL" = "ignorespace" ] ; then - export HISTCONTROL=ignoreboth -else - export HISTCONTROL=ignoredups -fi - -export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE HISTCONTROL - -for i in /etc/profile.d/*.sh ; do - if [ -r "$i" ]; then - if [ "$PS1" ]; then - . $i - else - . $i >/dev/null 2>&1 - fi - fi -done - -unset i -unset pathmunge diff --git a/pkgs/bash/shells b/pkgs/bash/shells deleted file mode 100644 index 1805018..0000000 --- a/pkgs/bash/shells +++ /dev/null @@ -1,7 +0,0 @@ -# Begin /etc/shells - -/bin/sh -/bin/bash -/sbin/nologin - -# End /etc/shells diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index d6f10cd..7c04a84 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 5 +PKG_REL = 6 PKG_EPOCH = 1 PKG_ARCH = noarch @@ -38,7 +38,7 @@ PKG_SUMMARY = Elementary scripts for the build system. PKG_BUILD_DEPS = PKG_DEPS += bash bzip2 coreutils diffutils file findutils gawk \ - grep gzip make patch pkgconfig sed system-release tar which xz + grep gzip make patch pkgconfig sed setup system-release tar which xz define PKG_DESCRIPTION This package contains elementary scripts for the pakfire build system. diff --git a/pkgs/perl-URI/perl-URI.nm b/pkgs/perl-URI/perl-URI.nm new file mode 100644 index 0000000..363dd17 --- /dev/null +++ b/pkgs/perl-URI/perl-URI.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 = URI +PKG_VER = 1.56 +PKG_REL = 1 +PKG_ARCH = noarch + +PKG_MAINTAINER = +PKG_GROUP = Development/Libraries +PKG_URL = http://search.cpan.org/dist/URI/ +PKG_LICENSE = GPL+ or Artistic +PKG_SUMMARY = A Perl module implementing URI parsing and manipulation. + +PKG_BUILD_DEPS+= \ + perl(ExtUtils::MakeMaker) \ + perl(MIME::Base64) + +define PKG_DESCRIPTION + This module implements the URI class. Objects of this class represent + Uniform Resource Identifier references as specified in RFC 2396 (and + updated by RFC 2732). +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && perl Makefile.PL INSTALLDIRS=perl + cd $(DIR_APP) && make $(PARALLELISMFLAGS) +endef diff --git a/pkgs/setup/Makefile b/pkgs/setup/Makefile new file mode 100644 index 0000000..31dbb7f --- /dev/null +++ b/pkgs/setup/Makefile @@ -0,0 +1,6 @@ + +check: + @echo Sanity checking selected files.... + bash -n bashrc + bash -n profile + ./uidgidlint ./uidgid diff --git a/pkgs/setup/aliases b/pkgs/setup/aliases new file mode 100644 index 0000000..1069e99 --- /dev/null +++ b/pkgs/setup/aliases @@ -0,0 +1,96 @@ +# +# Aliases in this file will NOT be expanded in the header from +# Mail, but WILL be visible over networks or from /bin/mail. +# +# >>>>>>>>>> The program "newaliases" must be run after +# >> NOTE >> this file is updated for any changes to +# >>>>>>>>>> show through to sendmail. +# + +# Basic system aliases -- these MUST be present. +mailer-daemon: postmaster +postmaster: root + +# General redirections for pseudo accounts. +bin: root +daemon: root +adm: root +lp: root +sync: root +shutdown: root +halt: root +mail: root +news: root +uucp: root +operator: root +games: root +gopher: root +ftp: root +nobody: root +radiusd: root +nut: root +dbus: root +vcsa: root +canna: root +wnn: root +rpm: root +nscd: root +pcap: root +apache: root +webalizer: root +dovecot: root +fax: root +quagga: root +radvd: root +pvm: root +amanda: root +privoxy: root +ident: root +named: root +xfs: root +gdm: root +mailnull: root +postgres: root +sshd: root +smmsp: root +postfix: root +netdump: root +ldap: root +squid: root +ntp: root +mysql: root +desktop: root +rpcuser: root +rpc: root +nfsnobody: root + +ingres: root +system: root +toor: root +manager: root +dumper: root +abuse: root + +newsadm: news +newsadmin: news +usenet: news +ftpadm: ftp +ftpadmin: ftp +ftp-adm: ftp +ftp-admin: ftp +www: webmaster +webmaster: root +noc: root +security: root +hostmaster: root +info: postmaster +marketing: postmaster +sales: postmaster +support: postmaster + + +# trap decode to catch security attacks +decode: root + +# Person who should get root's mail +#root: marc diff --git a/pkgs/setup/bashrc b/pkgs/setup/bashrc new file mode 100644 index 0000000..1d0dc1b --- /dev/null +++ b/pkgs/setup/bashrc @@ -0,0 +1,84 @@ +# /etc/bashrc + +# System wide functions and aliases +# Environment stuff goes in /etc/profile + +# It's NOT a good idea to change this file unless you know what you +# are doing. It's much better to create a custom.sh shell script in +# /etc/profile.d/ to make custom changes to your environment, as this +# will prevent the need for merging in future updates. + +# are we an interactive shell? +if [ "$PS1" ]; then + case $TERM in + xterm*) + if [ -e /etc/sysconfig/bash-prompt-xterm ]; then + PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm + else + PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + fi + ;; + screen) + if [ -e /etc/sysconfig/bash-prompt-screen ]; then + PROMPT_COMMAND=/etc/sysconfig/bash-prompt-screen + else + PROMPT_COMMAND='printf "\033]0;%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + fi + ;; + *) + [ -e /etc/sysconfig/bash-prompt-default ] && PROMPT_COMMAND=/etc/sysconfig/bash-prompt-default + ;; + esac + # Turn on checkwinsize + shopt -s checkwinsize + [ "$PS1" = "\\s-\\v\\\$ " ] && PS1="[\u@\h \W]\\$ " + # You might want to have e.g. tty in prompt (e.g. more virtual machines) + # and console windows + # If you want to do so, just add e.g. + # if [ "$PS1" ]; then + # PS1="[\u@\h:\l \W]\\$ " + # fi + # to your custom modification shell script in /etc/profile.d/ directory +fi + +if ! shopt -q login_shell ; then # We're not a login shell + # Need to redefine pathmunge, it get's undefined at the end of /etc/profile + pathmunge () { + case ":${PATH}:" in + *:"$1":*) + ;; + *) + if [ "$2" = "after" ] ; then + PATH=$PATH:$1 + else + PATH=$1:$PATH + fi + esac + } + + # By default, we want umask to get set. This sets it for non-login shell. + # Current threshold for system reserved uid/gids is 200 + # You could check uidgid reservation validity in + # /usr/share/doc/setup-*/uidgid file + if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then + umask 002 + else + umask 022 + fi + + # Only display echos from profile.d scripts if we are no login shell + # and interactive - otherwise just process them to set envvars + for i in /etc/profile.d/*.sh; do + if [ -r "$i" ]; then + if [ "$PS1" ]; then + . "$i" + else + . "$i" >/dev/null 2>&1 + fi + fi + done + + unset i + unset pathmunge +fi +# vim:ts=4:sw=4 diff --git a/pkgs/setup/exports b/pkgs/setup/exports new file mode 100644 index 0000000..e69de29 diff --git a/pkgs/setup/filesystems b/pkgs/setup/filesystems new file mode 100644 index 0000000..e31fe90 --- /dev/null +++ b/pkgs/setup/filesystems @@ -0,0 +1,8 @@ +ext3 +ext2 +nodev proc +nodev devpts +iso9660 +vfat +hfs +hfsplus diff --git a/pkgs/setup/group b/pkgs/setup/group new file mode 100644 index 0000000..4330b8d --- /dev/null +++ b/pkgs/setup/group @@ -0,0 +1,23 @@ +root::0:root +bin::1:root,bin,daemon +daemon::2:root,bin,daemon +sys::3:root,bin,adm +adm::4:root,adm,daemon +tty::5: +disk::6:root +lp::7:daemon,lp +mem::8: +kmem::9: +wheel::10:root +mail::12:mail +uucp::14:uucp +man::15: +games::20: +gopher::30: +video::39: +dip::40: +ftp::50: +lock::54: +audio::63: +nobody::99: +users::100: diff --git a/pkgs/setup/host.conf b/pkgs/setup/host.conf new file mode 100644 index 0000000..6cdfa5b --- /dev/null +++ b/pkgs/setup/host.conf @@ -0,0 +1,2 @@ +multi on +order hosts,bind diff --git a/pkgs/setup/hosts b/pkgs/setup/hosts new file mode 100644 index 0000000..849c10d --- /dev/null +++ b/pkgs/setup/hosts @@ -0,0 +1,2 @@ +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 diff --git a/pkgs/setup/hosts.allow b/pkgs/setup/hosts.allow new file mode 100644 index 0000000..6d99ba3 --- /dev/null +++ b/pkgs/setup/hosts.allow @@ -0,0 +1,10 @@ +# +# hosts.allow This file contains access rules which are used to +# allow or deny connections to network services that +# either use the tcp_wrappers library or that have been +# started through a tcp_wrappers-enabled xinetd. +# +# See 'man 5 hosts_options' and 'man 5 hosts_access' +# for information on rule syntax. +# See 'man tcpd' for information on tcp_wrappers +# diff --git a/pkgs/setup/hosts.deny b/pkgs/setup/hosts.deny new file mode 100644 index 0000000..c9bde8e --- /dev/null +++ b/pkgs/setup/hosts.deny @@ -0,0 +1,13 @@ +# +# hosts.deny This file contains access rules which are used to +# deny connections to network services that either use +# the tcp_wrappers library or that have been +# started through a tcp_wrappers-enabled xinetd. +# +# The rules in this file can also be set up in +# /etc/hosts.allow with a 'deny' option instead. +# +# See 'man 5 hosts_options' and 'man 5 hosts_access' +# for information on rule syntax. +# See 'man tcpd' for information on tcp_wrappers +# diff --git a/pkgs/setup/inputrc b/pkgs/setup/inputrc new file mode 100644 index 0000000..883686c --- /dev/null +++ b/pkgs/setup/inputrc @@ -0,0 +1,42 @@ +# do not bell on tab-completion +#set bell-style none + +set meta-flag on +set input-meta on +set convert-meta off +set output-meta on + +# Completed names which are symbolic links to +# directories have a slash appended. +set mark-symlinked-directories on + +$if mode=emacs + +# for linux console and RH/Debian xterm +"\e[1~": beginning-of-line +"\e[4~": end-of-line +# commented out keymappings for pgup/pgdown to reach begin/end of history +#"\e[5~": beginning-of-history +#"\e[6~": end-of-history +"\e[5~": history-search-backward +"\e[6~": history-search-forward +"\e[3~": delete-char +"\e[2~": quoted-insert +"\e[5C": forward-word +"\e[5D": backward-word +"\e[1;5C": forward-word +"\e[1;5D": backward-word + +# for rxvt +"\e[8~": end-of-line +"\eOc": forward-word +"\eOd": backward-word + +# for non RH/Debian xterm, can't hurt for RH/DEbian xterm +"\eOH": beginning-of-line +"\eOF": end-of-line + +# for freebsd console +"\e[H": beginning-of-line +"\e[F": end-of-line +$endif diff --git a/pkgs/setup/motd b/pkgs/setup/motd new file mode 100644 index 0000000..e69de29 diff --git a/pkgs/setup/passwd b/pkgs/setup/passwd new file mode 100644 index 0000000..d8b0737 --- /dev/null +++ b/pkgs/setup/passwd @@ -0,0 +1,15 @@ +root:*:0:0:root:/root:/bin/bash +bin:*:1:1:bin:/bin:/sbin/nologin +daemon:*:2:2:daemon:/sbin:/sbin/nologin +adm:*:3:4:adm:/var/adm:/sbin/nologin +lp:*:4:7:lp:/var/spool/lpd:/sbin/nologin +sync:*:5:0:sync:/sbin:/bin/sync +shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown +halt:*:7:0:halt:/sbin:/sbin/halt +mail:*:8:12:mail:/var/spool/mail:/sbin/nologin +uucp:*:10:14:uucp:/var/spool/uucp:/sbin/nologin +operator:*:11:0:operator:/root:/sbin/nologin +games:*:12:100:games:/usr/games:/sbin/nologin +gopher:*:13:30:gopher:/var/gopher:/sbin/nologin +ftp:*:14:50:FTP User:/var/ftp:/sbin/nologin +nobody:*:99:99:Nobody:/:/sbin/nologin diff --git a/pkgs/setup/printcap b/pkgs/setup/printcap new file mode 100644 index 0000000..9f88f82 --- /dev/null +++ b/pkgs/setup/printcap @@ -0,0 +1,7 @@ +# /etc/printcap +# +# Please don't edit this file directly unless you know what you are doing! +# This file will be automatically generated by cupsd(8) from the +# /etc/cups/printers.conf file. All changes to this file +# will be lost. + diff --git a/pkgs/setup/profile b/pkgs/setup/profile new file mode 100644 index 0000000..2d66685 --- /dev/null +++ b/pkgs/setup/profile @@ -0,0 +1,78 @@ +# /etc/profile + +# System wide environment and startup programs, for login setup +# Functions and aliases go in /etc/bashrc + +# It's NOT a good idea to change this file unless you know what you +# are doing. It's much better to create a custom.sh shell script in +# /etc/profile.d/ to make custom changes to your environment, as this +# will prevent the need for merging in future updates. + +pathmunge () { + case ":${PATH}:" in + *:"$1":*) + ;; + *) + if [ "$2" = "after" ] ; then + PATH=$PATH:$1 + else + PATH=$1:$PATH + fi + esac +} + + +if [ -x /usr/bin/id ]; then + if [ -z "$EUID" ]; then + # ksh workaround + EUID=`id -u` + UID=`id -ru` + fi + USER="`id -un`" + LOGNAME=$USER + MAIL="/var/spool/mail/$USER" +fi + +# Path manipulation +if [ "$EUID" = "0" ]; then + pathmunge /sbin + pathmunge /usr/sbin + pathmunge /usr/local/sbin +else + pathmunge /usr/local/sbin after + pathmunge /usr/sbin after + pathmunge /sbin after +fi + +HOSTNAME=`/bin/hostname 2>/dev/null` +HISTSIZE=1000 +if [ "$HISTCONTROL" = "ignorespace" ] ; then + export HISTCONTROL=ignoreboth +else + export HISTCONTROL=ignoredups +fi + +export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE HISTCONTROL + +# By default, we want umask to get set. This sets it for login shell +# Current threshold for system reserved uid/gids is 200 +# You could check uidgid reservation validity in +# /usr/share/doc/setup-*/uidgid file +if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then + umask 002 +else + umask 022 +fi + +for i in /etc/profile.d/*.sh ; do + if [ -r "$i" ]; then + if [ "${-#*i}" != "$-" ]; then + . "$i" + else + . "$i" >/dev/null 2>&1 + fi + fi +done + +unset i +unset pathmunge diff --git a/pkgs/setup/securetty b/pkgs/setup/securetty new file mode 100644 index 0000000..525f4de --- /dev/null +++ b/pkgs/setup/securetty @@ -0,0 +1,23 @@ +console +vc/1 +vc/2 +vc/3 +vc/4 +vc/5 +vc/6 +vc/7 +vc/8 +vc/9 +vc/10 +vc/11 +tty1 +tty2 +tty3 +tty4 +tty5 +tty6 +tty7 +tty8 +tty9 +tty10 +tty11 diff --git a/pkgs/setup/setup.nm b/pkgs/setup/setup.nm new file mode 100644 index 0000000..583abdb --- /dev/null +++ b/pkgs/setup/setup.nm @@ -0,0 +1,66 @@ +############################################################################### +# # +# 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 = setup +PKG_VER = 3.0 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUP = System/Base +PKG_URL = +PKG_LICENSE = Public Domain +PKG_SUMMARY = A set of system configuration and setup files. + +PKG_BUILD_DEPS = # Need no compiler. +PKG_DEPS += iana-etc + +define PKG_DESCRIPTION + The setup package contains a set of important system configuration and + setup files, such as passwd, group, and profile. +endef + +DIR_APP = $(DIR_SOURCE) + +define STAGE_BUILD + cd $(DIR_APP) && ./shadowconvert.sh +endef + +define STAGE_TEST + cd $(DIR_APP) && make check +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/etc/profile.d $(BUILDROOT)/var/log + + for i in aliases bashrc exports filesystems group gshadow host.conf \ + hosts hosts.allow hosts.deny inputrc motd passwd printcap \ + profile securetty shadow shells; do \ + cp -vf $(DIR_APP)/$${i} $(BUILDROOT)/etc || exit 1; \ + done + + touch $(BUILDROOT)/etc/{environment,fstab} $(BUILDROOT)/var/log/lastlog + chmod -v 0400 $(BUILDROOT)/etc/{,g}shadow +endef diff --git a/pkgs/setup/shadowconvert.sh b/pkgs/setup/shadowconvert.sh new file mode 100755 index 0000000..4be13b6 --- /dev/null +++ b/pkgs/setup/shadowconvert.sh @@ -0,0 +1,18 @@ +#!/bin/bash +if [ x`pwd` = "x/etc" ] +then + echo Cannot operate directly on \"/etc\". >&2 + exit 1 +fi + +#make prototype for /etc/shadow +sed -e "s/:.*/:*:`expr $(date +%s) / 86400`:0:99999:7:::/" passwd >shadow + +#make prototype for /etc/gshadow +sed -e 's/:[0-9]\+:/::/g' group >gshadow + +#mark passwd and group files entries shadowed +sed -i -e 's/^$[^:]\+$:[^:]*:/\1:x:/' passwd group + +echo Converted successfully. +exit 0 diff --git a/pkgs/setup/shells b/pkgs/setup/shells new file mode 100644 index 0000000..e9214ad --- /dev/null +++ b/pkgs/setup/shells @@ -0,0 +1,3 @@ +/bin/sh +/bin/bash +/sbin/nologin diff --git a/pkgs/setup/uidgid b/pkgs/setup/uidgid new file mode 100644 index 0000000..2486675 --- /dev/null +++ b/pkgs/setup/uidgid @@ -0,0 +1,130 @@ +NAME UID GID HOME SHELL PACKAGES +root 0 0 /root /bin/bash setup +bin 1 1 /bin /sbin/nologin setup +daemon 2 2 /sbin /sbin/nologin setup +sys - 3 - - setup +adm 3 4 /var/adm /bin/bash setup +tty - 5 - - setup +disk - 6 - - setup +lp 4 7 /var/spool/lpd /sbin/nologin setup +mem - 8 - - setup +kmem - 9 - - setup +wheel - 10 - - setup +cdrom - 11 - - udev,MAKEDEV +sync 5 (0) /sbin /bin/sync setup +shutdown 6 (0) /sbin /sbin/shutdown setup +halt 7 (0) /sbin /sbin/halt setup +mail 8 12 /var/spool/mail /sbin/nologin setup +news 9 13 /var/spool/news /sbin/nologin setup +uucp 10 14 /var/spool/uucp /sbin/nologin setup +operator 11 (0) /root /sbin/nologin setup +games 12 (100) /usr/games /sbin/nologin setup +gopher 13 30 /usr/lib/gopher-data /sbin/nologin setup +ftp 14 50 /var/ftp /sbin/nologin setup +man - 15 - - setup +oprofile 16 16 /home/oprofile /sbin/nologin oprofile +pkiuser 17 17 /usr/share/pki /sbin/nologin pki-ca,rhpki-ca +dialout - 18 - - udev,MAKEDEV +floppy - 19 - - dev,MAKEDEV +games - 20 - - setup +slocate - 21 - - slocate +utmp - 22 - - initscripts,libutempter +squid 23 23 /var/spool/squid /dev/null squid +pvm 24 24 /usr/share/pvm3 /bin/bash pvm +named 25 25 /var/named /bin/false bind +postgres 26 26 /var/lib/pgsql /bin/bash postgresql-server +mysql 27 27 /var/lib/mysql /bin/bash mysql +nscd 28 28 / /bin/false nscd +rpcuser 29 29 /var/lib/nfs /bin/false nfs-utils +console - 31 - - dev +rpc 32 32 / /bin/false portmap +amanda 33 (6) /var/lib/amanda /bin/false amanda +tape - 33 - - udev,MAKEDEV +netdump 34 34 /var/crash /bin/bash netdump-client, netdump-server +utempter - 35 - - libutempter +vdsm 36 - / /bin/bash kvm, vdsm +kvm - 36 - - kvm, vdsm, libvirt +rpm 37 37 /var/lib/rpm /bin/bash rpm +ntp 38 38 /etc/ntp /sbin/nologin ntp +video - 39 - - setup +dip - 40 - - setup +mailman 41 41 /var/mailman /bin/false mailman +gdm 42 42 /var/gdm /bin/bash gdm +xfs 43 43 /etc/X11/fs /bin/false XFree86-xfs +pppusers - 44 - - linuxconf +popusers - 45 - - linuxconf +slipusers - 46 - - linuxconf +mailnull 47 47 /var/spool/mqueue /dev/null sendmail +apache 48 48 /var/www /bin/false apache +wnn 49 49 /home/wnn /bin/bash FreeWnn +smmsp 51 51 /var/spool/mqueue /dev/null sendmail +puppet 52 52 /var/lib/puppet /sbin/nologin puppet +tomcat 53 53 /var/lib/tomcat /sbin/nologin tomcat +lock - 54 - - lockdev +ldap 55 55 /var/lib/ldap /bin/false openldap-servers +frontpage 56 56 /var/www /bin/false mod_frontpage +nut 57 57 /var/lib/ups /bin/false nut +beagleindex 58 58 /var/cache/beagle /bin/false beagle +tss 59 59 - /sbin/nologin trousers +piranha 60 60 /etc/sysconfig/ha /dev/null piranha +prelude-manager 61 61 - /sbin/nologin prelude-manager +snortd 62 62 - /sbin/nologin snortd +audio - 63 - - setup +condor 64 64 /var/lib/condor /sbin/nologin condord +nslcd 65 (55) / /sbin/nologin nslcd +wine - 66 - - wine +pegasus 66 65 /var/lib/Pegasus /sbin/nologin tog-pegasus +webalizer 67 67 /var/www/html/usage /sbin/nologin webalizer +haldaemon 68 68 / /sbin/nologin hal +vcsa 69 69 - /sbin/nologin dev,MAKEDEV +avahi 70 70 /var/run/avahi-daemon /sbin/nologin avahi +realtime - 71 - - - +tcpdump 72 72 / /sbin/nologin tcpdump +privoxy 73 73 /etc/privoxy /bin/bash privoxy +sshd 74 74 /var/empty/sshd /sbin/nologin openssh-server +radvd 75 75 / /bin/false radvd +cyrus 76 (12) /var/imap /bin/bash cyrus-imapd +saslauth - 76 - - cyrus-imapd +arpwatch 77 77 /var/lib/arpwatch /sbin/nologin arpwatch +fax 78 78 /var/spool/fax /sbin/nologin mgetty +nocpulse 79 79 /etc/sysconfig/nocpulse /bin/bash nocpulse +desktop 80 80 - /sbin/nologin desktop-file-utils +dbus 81 81 / /sbin/nologin dbus +jonas 82 82 /var/lib/jonas /sbin/nologin jonas +clamav 83 83 /tmp /sbin/nologin clamav +screen - 84 - - screen +quaggavt - 85 - - quagga +sabayon 86 86 - /sbin/nologin sabayon +polkituser 87 87 / /sbin/nologin PolicyKit +wbpriv - 88 - - samba-common +postfix 89 89 /var/spool/postfix /bin/true postfix +postdrop - 90 - - postfix +majordomo 91 91 /usr/lib/majordomo /bin/bash majordomo +quagga 92 92 / /sbin/nologin quagga +exim 93 93 /var/spool/exim /sbin/nologin exim +distcache 94 94 / /sbin/nologin distcache +radiusd 95 95 / /bin/false freeradius +hsqldb 96 96 /var/lib/hsqldb /sbin/nologin hsqldb +dovecot 97 97 /usr/libexec/dovecot /sbin/nologin dovecot +ident 98 98 / /sbin/nologin ident +nobody 99 99 / /sbin/nologin setup +users - 100 - - setup +qemu 107 107 / /sbin/nologin libvirt +ovirt 108 108 / /sbin/nologin libvirt +rhevm 109 109 /home/rhevm /sbin/nologin vdsm-reg +saned 111 111 / /sbin/nologin sane-backends +vhostmd 112 112 /usr/share/vhostmd /sbin/nologin vhostmd +usbmuxd 113 113 / /sbin/nologin usbmuxd +bacula 133 133 /var/spool/bacula /sbin/nologin bacula +ricci 140 140 /var/lib/ricci /sbin/nologin ricci +luci 141 141 /var/lib/luci /sbin/nologin luci +stap-server 155 155 /var/lib/stap-server /sbin/nologin systemtap +avahi-autoipd 170 170 /var/lib/avahi-autoipd /sbin/nologin avahi +pulse 171 171 /var/run/pulse /sbin/nologin pulseaudio +rtkit 172 172 /proc /sbin/nologin rtkit +abrt 173 173 /etc/abrt /sbin/nologin abrt +gnats ? ? ? ? gnats, gnats-db +listar ? ? ? ? listar +nfsnobody 65534 65534 /var/lib/nfs /sbin/nologin nfs-utils + +# Note: nfsnobdy is 4294967294 on 64-bit platforms (-2) diff --git a/pkgs/setup/uidgidlint b/pkgs/setup/uidgidlint new file mode 100755 index 0000000..c1249ff --- /dev/null +++ b/pkgs/setup/uidgidlint @@ -0,0 +1,24 @@ +#!/bin/sh +# We need a file to look at. +if [ -z "$*" ] ; then + echo Usage: `basename $0` uidgid + exit 1 +fi +# The format of the file is (currently) +for infile in "$@" ; do + uidlist=`tail -n +2 "$infile" | awk '{print $2}' | grep -v '?' | grep -v -e - | sort -nu` + gidlist=`tail -n +2 "$infile" | awk '{print $3}' | grep -v '?' | grep -v -e - | sort -nu` + for uid in $uidlist ; do + if test `tail -n +2 "$infile" | awk '{print $2}' | grep '^'"$uid"'$' | wc -l` -ne 1 ; then + echo Duplicate UID: $uid + exit 1 + fi + done + for gid in $gidlist ; do + if test `tail -n +2 "$infile" | awk '{print $3}' | grep '^'"$gid"'$' | wc -l` -ne 1 ; then + echo Duplicate GID: $gid + exit 1 + fi + done +done +exit 0 diff --git a/pkgs/wget/wget.nm b/pkgs/wget/wget.nm index 9e2cf74..00cc492 100644 --- a/pkgs/wget/wget.nm +++ b/pkgs/wget/wget.nm @@ -42,7 +42,7 @@ define PKG_DESCRIPTION support, etc. endef -PKG_BUILD_DEPS+= libidn-devel openssl-devel perl-Pod-Simple perl-Pod-Escapes +PKG_BUILD_DEPS+= libidn-devel openssl-devel PKG_TARBALL = $(THISAPP).tar.lzma diff --git a/pkgs/xz/xz.nm b/pkgs/xz/xz.nm index b7a20f6..eea707f 100644 --- a/pkgs/xz/xz.nm +++ b/pkgs/xz/xz.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = xz PKG_VER = 5.0.1 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUP = Applications/Compression @@ -34,7 +34,7 @@ PKG_URL = http://tukaani.org/xz/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = LZMA Utils. -PKG_PACKAGES += $(PKG_NAME_REAL)-devel +PKG_PACKAGES += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-libs define PKG_DESCRIPTION LZMA provides very high compression ratio and fast decompression. The \ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 592840da1cf41d21532062d60d6e35af8b3d38f8
by git＠ipfire.org 10 Mar '11

10 Mar '11

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 592840da1cf41d21532062d60d6e35af8b3d38f8 (commit) via 7c448a12c432848b8bda990941b9388e0e69ea9d (commit) from 795572ba9beeaa7379b7ff95c71fc0cf3f563c23 (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 592840da1cf41d21532062d60d6e35af8b3d38f8 Merge: 795572b 7c448a1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 20:22:06 2011 +0100 Merge remote-tracking branch 'arne_f/openssh' commit 7c448a12c432848b8bda990941b9388e0e69ea9d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 10 19:23:14 2011 +0100 openssh: add ecdsa hostkey generation to initskript. ----------------------------------------------------------------------- Summary of changes: pkgs/openssh/openssh.init | 2 +- pkgs/openssh/openssh.nm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/pkgs/openssh/openssh.init b/pkgs/openssh/openssh.init index 35d1c4f..f0e7717 100644 --- a/pkgs/openssh/openssh.init +++ b/pkgs/openssh/openssh.init @@ -5,7 +5,7 @@ start on started network stop on kill-all-network-services or stopping network pre-start script - for algo in dsa rsa; do + for algo in dsa rsa ecdsa; do [ -e "/etc/ssh/ssh_host_${algo}_key" ] && continue /usr/bin/ssh-keygen -q -t ${algo} -N "" -f /etc/ssh/ssh_host_${algo}_key done diff --git a/pkgs/openssh/openssh.nm b/pkgs/openssh/openssh.nm index 45a982a..ac5c2dd 100644 --- a/pkgs/openssh/openssh.nm +++ b/pkgs/openssh/openssh.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = openssh PKG_VER = 5.8p1 -PKG_REL = 4 +PKG_REL = 5 PKG_MAINTAINER = PKG_GROUP = Application/Internet hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 795572ba9beeaa7379b7ff95c71fc0cf3f563c23
by git＠ipfire.org 10 Mar '11

10 Mar '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 57b732dbec865b4a47644a8d71a7fa1b11e36586
by git＠ipfire.org 09 Mar '11

09 Mar '11

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 57b732dbec865b4a47644a8d71a7fa1b11e36586 (commit) via ecd3c6347ac99f24a7366a626ae40558c1ac2daf (commit) via 9bb4953ab1490bdc898832f5c959b1fa3692d9a6 (commit) via 0c9e602e59930ce7846f915718c22f4d0a6da37f (commit) from 06ff00a58d2a9e96d06b723c556683982f53bf9a (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 57b732dbec865b4a47644a8d71a7fa1b11e36586 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 9 01:26:09 2011 +0100 pakfire: Update to 0.9.2. commit ecd3c6347ac99f24a7366a626ae40558c1ac2daf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 9 01:17:29 2011 +0100 perl: Filter misgenerated provides/requires. commit 9bb4953ab1490bdc898832f5c959b1fa3692d9a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 9 01:17:02 2011 +0100 ebtables: Filter accidently scanned requires. commit 0c9e602e59930ce7846f915718c22f4d0a6da37f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 9 01:16:36 2011 +0100 build-essentials: Add support to filter weird provides or requires. ----------------------------------------------------------------------- Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- .../buildsystem-tools/functions-packager-find | 17 +++++- pkgs/build-essentials/buildsystem/Constants | 5 +- pkgs/ebtables/ebtables.nm | 4 +- pkgs/pakfire/pakfire.nm | 4 +- pkgs/perl/perl.nm | 68 +++++++++++++++++++- 6 files changed, 93 insertions(+), 7 deletions(-) Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index b70c0b4..d6f10cd 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 4 +PKG_REL = 5 PKG_EPOCH = 1 PKG_ARCH = noarch diff --git a/pkgs/build-essentials/buildsystem-tools/functions-packager-find b/pkgs/build-essentials/buildsystem-tools/functions-packager-find index 80f5457..246c248 100644 --- a/pkgs/build-essentials/buildsystem-tools/functions-packager-find +++ b/pkgs/build-essentials/buildsystem-tools/functions-packager-find @@ -49,6 +49,11 @@ function find_requires() { local requires for require in $(listsort ${PKG_DEPS} ${interpreters} ${neededs} ${links} ${others}); do [ "${require:0:3}" = "ld-" ] && continue + + if [ -n "${PKG_REQUIRES_FILTER}" ]; then + grep -qE "${PKG_REQUIRES_FILTER}" <<< "${require}" && continue + fi + listmatch ${require} ${provides} || requires="${requires} ${require}" done @@ -71,7 +76,17 @@ function find_provides() { others="${others} $(find_perl_provides ${dirs})" others="${others} $(find_pkgconfig_provides ${dirs})" - listsort ${PKG_PROVIDES} ${sonames} ${others} + local provide + local provides + for provide in $(listsort ${PKG_PROVIDES} ${sonames} ${others}); do + if [ -n "${PKG_PROVIDES_FILTER}" ]; then + grep -qE "${PKG_PROVIDES_FILTER}" <<< "${provide}" && continue + fi + + provides="${provides} ${provide}" + done + + echo ${provides} } function find_interpreters() { diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index 3159e32..e23671a 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -73,7 +73,10 @@ PKG_VARIABLES = \ PKG_RELEASE \ PKG_SUMMARY \ PKG_URL \ - PKG_VER + PKG_VER \ + \ + PKG_PROVIDES_FILTER \ + PKG_REQUIRES_FILTER # Variables that exported to the packager process # These reflect settings from the build system diff --git a/pkgs/ebtables/ebtables.nm b/pkgs/ebtables/ebtables.nm index 7be3632..6d0254f 100644 --- a/pkgs/ebtables/ebtables.nm +++ b/pkgs/ebtables/ebtables.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = ebtables PKG_VER = v2.0.9-2 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Networking/Tools @@ -44,6 +44,8 @@ PKG_TARBALL = $(THISAPP).tar.gz CFLAGS += -Wall +PKG_REQUIRES_FILTER = libebt + define QUALITY_AGENT_WHITELIST_RPATH /lib/ebtables endef diff --git a/pkgs/pakfire/pakfire.nm b/pkgs/pakfire/pakfire.nm index e3cdc39..8d50c08 100644 --- a/pkgs/pakfire/pakfire.nm +++ b/pkgs/pakfire/pakfire.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = pakfire -PKG_VER = 0.9.1 +PKG_VER = 0.9.2 PKG_REL = 1 PKG_ARCH = noarch @@ -35,7 +35,7 @@ PKG_URL = http://www.ipfire.org/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = Package installer/updater. -PKG_BUILD_DEPS = python-devel python-distutils-extra +PKG_BUILD_DEPS = python-devel python-distutils-extra $(PKG_DEPS) PKG_DEPS += pyliblzma python-progressbar python-urlgrabber pyxattr \ system-release diff --git a/pkgs/perl/perl.nm b/pkgs/perl/perl.nm index c9a8cec..a556292 100644 --- a/pkgs/perl/perl.nm +++ b/pkgs/perl/perl.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = perl PKG_VER = 5.12.3 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = PKG_GROUP = Development/Languages @@ -50,12 +50,78 @@ endef PKG_TARBALL = $(THISAPP).tar.gz +# Filter string for very weird dependencies. +PKG_REQUIRES_FILTER = (DBD\:\:SQLite|DBIx\:\:Simple|perl>=[0-9]\:.*|NDBM_File|Your\:\:Module\:\:Here|FCGI|Mac\:\:.*) + define QUALITY_AGENT_WHITELIST_RPATH /lib /usr/lib /usr/lib/perl5/CORE endef +# These provides are needed by the perl pkg itself with auto-generated perl.req +PKG_PROVIDES-perl += \ + perl(VMS::Filespec) \ + perl(VMS::Stdio) + +# Compat provides +PKG_PROVIDES-perl += \ + perl(:MODULE_COMPAT_5.12.3) \ + perl(:MODULE_COMPAT_5.12.2) \ + perl(:MODULE_COMPAT_5.12.1) \ + perl(:MODULE_COMPAT_5.12.0) + +# Threading provides +PKG_PROVIDES-perl += \ + perl(:WITH_ITHREADS) \ + perl(:WITH_THREADS) + +# Largefile provides +PKG_PROVIDES-perl += perl(:WITH_LARGEFILES) + +# PerlIO provides +PKG_PROVIDES-perl += perl(:WITH_PERLIO) + +# File provides +PKG_PROVIDES-perl += \ + perl(abbrev.pl) \ + perl(assert.pl) \ + perl(bigfloat.pl) \ + perl(bigint.pl) \ + perl(bigrat.pl) \ + perl(bytes_heavy.pl) \ + perl(cacheout.pl) \ + perl(complete.pl) \ + perl(ctime.pl) \ + perl(dotsh.pl) \ + perl(dumpvar.pl) \ + perl(exceptions.pl) \ + perl(fastcwd.pl) \ + perl(find.pl) \ + perl(finddepth.pl) \ + perl(flush.pl) \ + perl(ftp.pl) \ + perl(getcwd.pl) \ + perl(getopt.pl) \ + perl(getopts.pl) \ + perl(hostname.pl) \ + perl(importenv.pl) \ + perl(look.pl) \ + perl(newgetopt.pl) \ + perl(open2.pl) \ + perl(open3.pl) \ + perl(perl5db.pl) \ + perl(pwd.pl) \ + perl(shellwords.pl) \ + perl(stat.pl) \ + perl(syslog.pl) \ + perl(tainted.pl) \ + perl(termcap.pl) \ + perl(timelocal.pl) \ + perl(utf8_heavy.pl) \ + perl(validate.pl) \ + perl(Carp::Heavy) + define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -i 's/command /command[ -]/' makedepend.SH endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 06ff00a58d2a9e96d06b723c556683982f53bf9a
by git＠ipfire.org 08 Mar '11

08 Mar '11

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 06ff00a58d2a9e96d06b723c556683982f53bf9a (commit) via e832e6f2c4a63897a7ccba8df24eb29502d3e690 (commit) from 3b39cb04ade75a7d40dffec2e54dd198f8950a0e (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 06ff00a58d2a9e96d06b723c556683982f53bf9a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 9 00:32:10 2011 +0100 elinks: Enhance with more libraries: openssl, zlib, libidn. Also enables support for bittorrent protocol. commit e832e6f2c4a63897a7ccba8df24eb29502d3e690 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 8 23:54:56 2011 +0100 wget: Link to openssl and libidn. This will support SSL connections and international domain names. ----------------------------------------------------------------------- Summary of changes: pkgs/elinks/elinks.nm | 9 +++++++-- pkgs/wget/wget.nm | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) Difference in files: diff --git a/pkgs/elinks/elinks.nm b/pkgs/elinks/elinks.nm index e7d018b..de97e8c 100644 --- a/pkgs/elinks/elinks.nm +++ b/pkgs/elinks/elinks.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = elinks PKG_VER = 0.11.7 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/Internet @@ -34,7 +34,8 @@ PKG_URL = http://elinks.or.cz/ PKG_LICENSE = GPLv2 PKG_SUMMARY = Full-Featured Text WWW Browser. -PKG_BUILD_DEPS+= gdbm-devel +PKG_BUILD_DEPS+= expat-devel gdbm-devel gnutls-devel libidn-devel \ + openssl-devel zlib-devel define PKG_DESCRIPTION ELinks is an advanced and well-established feature-rich text mode \ @@ -44,3 +45,7 @@ define PKG_DESCRIPTION endef PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --enable-bittorrent \ + --enable-256-colors diff --git a/pkgs/wget/wget.nm b/pkgs/wget/wget.nm index 3efc006..9e2cf74 100644 --- a/pkgs/wget/wget.nm +++ b/pkgs/wget/wget.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = wget PKG_VER = 1.12 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Applications/Internet @@ -42,7 +42,7 @@ define PKG_DESCRIPTION support, etc. endef -PKG_BUILD_DEPS+= perl-Pod-Simple perl-Pod-Escapes +PKG_BUILD_DEPS+= libidn-devel openssl-devel perl-Pod-Simple perl-Pod-Escapes PKG_TARBALL = $(THISAPP).tar.lzma hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3b39cb04ade75a7d40dffec2e54dd198f8950a0e
by git＠ipfire.org 07 Mar '11

07 Mar '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3046fa42b116e8ff4531e48db8dabaa6b5750f48
by git＠ipfire.org 07 Mar '11

07 Mar '11

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 3046fa42b116e8ff4531e48db8dabaa6b5750f48 (commit) from 5bfa669faa0c522692ec8e3a7f9356c0a8b57615 (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 3046fa42b116e8ff4531e48db8dabaa6b5750f48 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Mar 7 11:32:17 2011 +0100 samba: increment PAK_VER. ----------------------------------------------------------------------- Summary of changes: lfs/samba | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/lfs/samba b/lfs/samba index 595cb9d..449cb12 100644 --- a/lfs/samba +++ b/lfs/samba @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 33 +PAK_VER = 34 DEPS = "cups" hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5bfa669faa0c522692ec8e3a7f9356c0a8b57615
by git＠ipfire.org 07 Mar '11

07 Mar '11

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 5bfa669faa0c522692ec8e3a7f9356c0a8b57615 (commit) via 0b642c3a73c40e4bdebd6a06881095bc43cb3d6a (commit) via 857fca3785cb6beb42c501152d6c389c64d62b01 (commit) from 489b3c48a4f4fe21f021eb2d0aff03b3fe585a9f (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 5bfa669faa0c522692ec8e3a7f9356c0a8b57615 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Mar 7 11:20:04 2011 +0100 samba: updated to 3.5.8. commit 0b642c3a73c40e4bdebd6a06881095bc43cb3d6a Merge: 857fca3 489b3c4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Mar 7 11:19:57 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit 857fca3785cb6beb42c501152d6c389c64d62b01 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Mar 7 08:33:12 2011 +0100 ipfireseeder: seed core47. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 6 +++--- lfs/samba | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 8b4f00f..4e21567 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core46.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core47.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index d333fc3..4bdbc48 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core46.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core47.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 22 +PAK_VER = 23 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8484574559180f14f9c98d7d3140c3ed +$(DL_FILE)_MD5 = 388d32a2f741df4afa76578948804ae3 install : $(TARGET) diff --git a/lfs/samba b/lfs/samba index 369bb18..595cb9d 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.5.7 +VER = 3.5.8 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b04441da711df05a1525bf57b92c051b +$(DL_FILE)_MD5 = 355b4530c20997e94aebc74cd6ea5307 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fdeadc4798175713d665deeada69cdc132a8ecb0
by git＠ipfire.org 07 Mar '11

07 Mar '11

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 fdeadc4798175713d665deeada69cdc132a8ecb0 (commit) from dcc3c9bd46292cfbd066d37a5b174751258e314a (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 fdeadc4798175713d665deeada69cdc132a8ecb0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 7 11:23:01 2011 +0100 ppp: Fix broken build. This was caused by a bad header files that does not fit into the system anymore. ----------------------------------------------------------------------- Summary of changes: pkgs/ppp/ppp.nm | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/ppp/ppp.nm b/pkgs/ppp/ppp.nm index 7bcd150..1268a76 100644 --- a/pkgs/ppp/ppp.nm +++ b/pkgs/ppp/ppp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = ppp PKG_VER = 2.4.5 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Daemons @@ -57,6 +57,9 @@ define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -e "s@^DESTDIR.*@DESTDIR=\$$(INSTROOT)/usr@" \ -i pppd/plugins/pppol2tp/Makefile.linux + + # Remove broken header file that crashed the build. + cd $(DIR_APP) && rm -f include/linux/if_pppol2tp.h endef define STAGE_BUILD hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. dcc3c9bd46292cfbd066d37a5b174751258e314a
by git＠ipfire.org 06 Mar '11

06 Mar '11

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2011