IPFire-SCM August 2011

ipfire-scm@lists.ipfire.org

1 participants
59 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3748760dc674f825bef7e18c46ad56e825e233a4
by git＠ipfire.org 04 Aug '11

04 Aug '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 3748760dc674f825bef7e18c46ad56e825e233a4 (commit) via 1a3b57c15ca51aa5be8d2656a6613169b1d6a081 (commit) from a0ee1f1cc017e581daa02bda1c7384bcab5c7347 (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 3748760dc674f825bef7e18c46ad56e825e233a4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 4 12:34:10 2011 +0200 dbus-glib: Update to 0.94. commit 1a3b57c15ca51aa5be8d2656a6613169b1d6a081 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 4 12:22:58 2011 +0200 build-essentials: Fix for finding provides. Value was overwritten. ----------------------------------------------------------------------- Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- .../buildsystem-tools/dependency-tracker | 2 +- pkgs/dbus-glib/dbus-glib.nm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 01cd863..ca9a36d 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 = 1.1 -PKG_REL = 1 +PKG_REL = 2 PKG_EPOCH = 2 PKG_ARCH = noarch diff --git a/pkgs/build-essentials/buildsystem-tools/dependency-tracker b/pkgs/build-essentials/buildsystem-tools/dependency-tracker index 1c29025..8bdb839 100755 --- a/pkgs/build-essentials/buildsystem-tools/dependency-tracker +++ b/pkgs/build-essentials/buildsystem-tools/dependency-tracker @@ -21,7 +21,7 @@ if [ -n "${PKG_PREREQUIRES}" ]; then fi echo "requires=\"${requires}\"" echo "provides=\"${provides}\"" -echo "provides=\"${PKG_CONFLICTS}\"" +echo "conflicts=\"${PKG_CONFLICTS}\"" echo "obsoletes=\"${PKG_OBSOLETES}\"" exit 0 diff --git a/pkgs/dbus-glib/dbus-glib.nm b/pkgs/dbus-glib/dbus-glib.nm index 766515a..319cc01 100644 --- a/pkgs/dbus-glib/dbus-glib.nm +++ b/pkgs/dbus-glib/dbus-glib.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = dbus-glib -PKG_VER = 0.82 +PKG_VER = 0.94 PKG_REL = 1 PKG_MAINTAINER = @@ -34,7 +34,7 @@ PKG_URL = http://www.freedesktop.org/software/dbus/ PKG_LICENSE = GPLv2+ AFL PKG_SUMMARY = Glib bindings for D-Bus. -PKG_BUILD_DEPS+= dbus dbus-devel expat-devel gettext glib2-devel pkg-config +PKG_BUILD_DEPS+= dbus dbus-devel expat-devel gettext glib2-devel PKG_DEPS-$(PKG_NAME)-devel = glib2-devel define PKG_DESCRIPTION hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a0ee1f1cc017e581daa02bda1c7384bcab5c7347
by git＠ipfire.org 03 Aug '11

03 Aug '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 a0ee1f1cc017e581daa02bda1c7384bcab5c7347 (commit) via 24f0fa6996c3c6b6b36116a4d126793e51529ccc (commit) via 9fe13dd3fef42deb63b26ab692c2a874bcbc5851 (commit) from 103fc32c10e3b681364af6bd4c21e02e832b5ee0 (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 a0ee1f1cc017e581daa02bda1c7384bcab5c7347 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 3 21:55:05 2011 +0200 chrony: Compile with libedit support. commit 24f0fa6996c3c6b6b36116a4d126793e51529ccc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 3 21:51:59 2011 +0200 basesystem: Do not require vim. commit 9fe13dd3fef42deb63b26ab692c2a874bcbc5851 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 3 21:51:41 2011 +0200 libedit: New package. Simliar to readline. ----------------------------------------------------------------------- Summary of changes: pkgs/basesystem/basesystem.nm | 4 +- pkgs/chrony/chrony.nm | 4 +- pkgs/{pth/pth.nm => libedit/libedit.nm} | 32 +++++++++++++++--------------- 3 files changed, 20 insertions(+), 20 deletions(-) copy pkgs/{pth/pth.nm => libedit/libedit.nm} (75%) Difference in files: diff --git a/pkgs/basesystem/basesystem.nm b/pkgs/basesystem/basesystem.nm index ec7780a..d0f09c5 100644 --- a/pkgs/basesystem/basesystem.nm +++ b/pkgs/basesystem/basesystem.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = basesystem PKG_VER = 2.99 -PKG_REL = 2 +PKG_REL = 3 PKG_EPOCH = 1 PKG_ARCH = noarch @@ -43,7 +43,7 @@ PKG_BUILD_DEPS = # There are no build dependencies PKG_DEPS += /bin/sh /sbin/init \ coreutils file filesystem findutils gawk grep iana-etc initscripts kbd \ less module-init-tools network pakfire passwd procps psmisc sed setup \ - shadow syslog system-release tar udev util-linux vim + shadow syslog system-release tar udev util-linux define PKG_DESCRIPTION This package contains files that are needed to run basic \ diff --git a/pkgs/chrony/chrony.nm b/pkgs/chrony/chrony.nm index f5b152c..41fc286 100644 --- a/pkgs/chrony/chrony.nm +++ b/pkgs/chrony/chrony.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = chrony PKG_VER = 1.26 -PKG_REL = 5 +PKG_REL = 6 PKG_MAINTAINER = PKG_GROUPS = Base System/Daemons @@ -34,7 +34,7 @@ PKG_URL = http://chrony.tuxfamily.org PKG_LICENSE = GPLv2 PKG_SUMMARY = An NTP client/server. -PKG_BUILD_DEPS+= bison libcap-devel readline-devel texinfo +PKG_BUILD_DEPS+= bison libcap-devel libedit-devel readline-devel texinfo define PKG_DESCRIPTION A client/server for the Network Time Protocol, this program keeps your diff --git a/pkgs/libedit/libedit.nm b/pkgs/libedit/libedit.nm new file mode 100644 index 0000000..23f1647 --- /dev/null +++ b/pkgs/libedit/libedit.nm @@ -0,0 +1,58 @@ +############################################################################### +# # +# 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 = libedit +PKG_VER = 3.0-$(PKG_DATE) +PKG_DATE = 20110802 +PKG_REL = 1 + +PKG_MAINTAINER = +PKG_GROUPS = System/Libraries +PKG_URL = http://www.thrysoee.dk/editline/ +PKG_LICENSE = BSD +PKG_SUMMARY = The NetBSD Editline library. + +PKG_BUILD_DEPS+= ncurses-devel + +define PKG_DESCRIPTION + Libedit is an autotool- and libtoolized port of the NetBSD Editline + library. It provides generic line editing, history, and tokenization + functions, similar to those found in GNU Readline. +endef + +THISAPP = $(PKG_NAME)-$(PKG_DATE)-3.0 +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME)-devel +PKG_DEPS-libedit += ncurses-devel + +CONFIGURE_OPTIONS += \ + --disable-static \ + --enable-widec + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -i "s/lcurses/ltinfo/" src/Makefile* +endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 103fc32c10e3b681364af6bd4c21e02e832b5ee0
by git＠ipfire.org 03 Aug '11

03 Aug '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 103fc32c10e3b681364af6bd4c21e02e832b5ee0 (commit) from de1ded0df790822e345bc7655f4b4f4d26cb82c4 (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 103fc32c10e3b681364af6bd4c21e02e832b5ee0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 3 21:34:28 2011 +0200 less: Update to 444. ----------------------------------------------------------------------- Summary of changes: pkgs/less/less.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/less/less.nm b/pkgs/less/less.nm index c590f89..62daa92 100644 --- a/pkgs/less/less.nm +++ b/pkgs/less/less.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = less -PKG_VER = 443 +PKG_VER = 444 PKG_REL = 1 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. de1ded0df790822e345bc7655f4b4f4d26cb82c4
by git＠ipfire.org 03 Aug '11

03 Aug '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 de1ded0df790822e345bc7655f4b4f4d26cb82c4 (commit) from fdd425b9a197cf4cc0068eeb2a01ffbf90a821c9 (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 de1ded0df790822e345bc7655f4b4f4d26cb82c4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 3 12:27:47 2011 +0200 python-pycurl: Fix dependencies for curl. pycurl checks the version of libcurl when it starts and needs the same or a higher version than it was built with. ----------------------------------------------------------------------- Summary of changes: pkgs/python-pycurl/python-pycurl.nm | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/python-pycurl/python-pycurl.nm b/pkgs/python-pycurl/python-pycurl.nm index d78f031..712e906 100644 --- a/pkgs/python-pycurl/python-pycurl.nm +++ b/pkgs/python-pycurl/python-pycurl.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = pycurl PKG_VER = 7.19.0 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = PKG_GROUPS = Development/Languages @@ -38,6 +38,14 @@ CFLAGS += -DHAVE_CURL_OPENSSL PKG_BUILD_DEPS+= libcurl-devel openssl-devel python-devel +# During its initialization, PycURL checks that the actual libcurl version +# is not lower than the one used when PycURL was built. +# Yes, that should be handled by library versioning (which would then get +# automatically reflected). +# For now, we have to reflect that dependency. +LIBCURL_VERSION = $(shell curl-config --version | awk '{ print $$NF }') +PKG_DEPS += libcurl>=$(LIBCURL_VERSION) + define PKG_DESCRIPTION PycURL is a Python interface to libcurl. PycURL can be used to fetch \ objects identified by a URL from a Python program, similar to the \ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f99f4293e7ccb913105be165ddf25ea90bf676d4
by git＠ipfire.org 01 Aug '11

01 Aug '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, next has been updated via f99f4293e7ccb913105be165ddf25ea90bf676d4 (commit) via 2444cc97804bbb9874fd2145f596c9d92d540b81 (commit) via 9d85ac3b9362cd97ece5303dea1f95052626848a (commit) from 5520be2f215bcf904d413a77242a0209829ada36 (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 f99f4293e7ccb913105be165ddf25ea90bf676d4 Merge: 2444cc9 5520be2 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Aug 1 19:08:35 2011 +0200 Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next Conflicts: html/cgi-bin/vpnmain.cgi commit 2444cc97804bbb9874fd2145f596c9d92d540b81 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Aug 1 19:07:00 2011 +0200 VPN RW IP can be empty. commit 9d85ac3b9362cd97ece5303dea1f95052626848a Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Aug 1 18:58:54 2011 +0200 Added Roadwarrior Network to the ipsec gui. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 28fcdac..888372e 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -475,7 +475,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg goto SAVE_ERROR; } - if ( !&General::validipandmask($cgiparams{'RW_NET'}) ) { + if ( $cgiparams{'RW_NET'} ne '' and !&General::validipandmask($cgiparams{'RW_NET'}) ) { $errormessage = $Lang::tr{'urlfilter invalid ip or mask error'}; goto SAVE_ERROR; } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5520be2f215bcf904d413a77242a0209829ada36
by git＠ipfire.org 01 Aug '11

01 Aug '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, next has been updated via 5520be2f215bcf904d413a77242a0209829ada36 (commit) from 18fe7748e785649097b480ba522ed8835a4e36c1 (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 5520be2f215bcf904d413a77242a0209829ada36 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Aug 1 18:58:54 2011 +0200 Added Roadwarrior Network to the ipsec gui. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 177cdf4..28fcdac 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -111,6 +111,7 @@ $cgiparams{'ROOTCERT_EMAIL'} = ''; $cgiparams{'ROOTCERT_OU'} = ''; $cgiparams{'ROOTCERT_CITY'} = ''; $cgiparams{'ROOTCERT_STATE'} = ''; +$cgiparams{'RW_NET'} = ''; &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); @@ -474,6 +475,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg goto SAVE_ERROR; } + if ( !&General::validipandmask($cgiparams{'RW_NET'}) ) { + $errormessage = $Lang::tr{'urlfilter invalid ip or mask error'}; + goto SAVE_ERROR; + } + map ($vpnsettings{$_} = $cgiparams{$_}, ('ENABLED','DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL', 'DBG_DNS')); @@ -482,6 +488,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg $vpnsettings{'VPN_DELAYED_START'} = $cgiparams{'VPN_DELAYED_START'}; $vpnsettings{'VPN_OVERRIDE_MTU'} = $cgiparams{'VPN_OVERRIDE_MTU'}; $vpnsettings{'VPN_WATCH'} = $cgiparams{'VPN_WATCH'}; + $vpnsettings{'RW_NET'} = $cgiparams{'RW_NET'}; &General::writehash("${General::swroot}/vpn/settings", \%vpnsettings); &writeipsecfiles(); if (&vpnenabled) { @@ -2478,6 +2485,10 @@ print <<END <td class='base' nowrap='nowrap'>$Lang::tr{'vpn delayed start'}: <img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*' /></td> <td ><input type='text' name='VPN_DELAYED_START' value='$cgiparams{'VPN_DELAYED_START'}' /></td> </tr> + <tr> + <td class='base' nowrap='nowrap'>$Lang::tr{'host to net vpn'}: <img src='/blob.gif' alt='*' /></td> + <td ><input type='text' name='RW_NET' value='$cgiparams{'RW_NET'}' /></td> + </tr> </table> $Lang::tr{'vpn watch'}:<input type='checkbox' name='VPN_WATCH' $checked{'VPN_WATCH'} /> PLUTO DEBUG = hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. db11006f7881682349f47af378f70e294c892d6c
by git＠ipfire.org 01 Aug '11

01 Aug '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 db11006f7881682349f47af378f70e294c892d6c (commit) via 9d6f4de94dfe6c1c57fe4190a9ade95ee1f8ab24 (commit) from 87984cad1cd228a005b31d52483235915add715e (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 db11006f7881682349f47af378f70e294c892d6c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 1 18:21:43 2011 +0200 langs_ru: sort strings. commit 9d6f4de94dfe6c1c57fe4190a9ade95ee1f8ab24 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 1 18:20:42 2011 +0200 lang_ru: fix typo. ----------------------------------------------------------------------- Summary of changes: langs/ru/cgi-bin/ru.pl | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) Difference in files: diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 728d315..946e302 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -17,7 +17,6 @@ 'ConnSched down' => 'Down', 'ConnSched ipsecstart' => 'IPSec (пере)запустить', 'ConnSched ipsecstop' => 'IPSec остановить', -'cpu frequency per' => 'CPU frequency per', 'ConnSched reconnect' => 'Переподключить', 'ConnSched scheduled actions' => 'Действия по расписанию', 'ConnSched scheduler' => 'Расписание', @@ -205,7 +204,6 @@ 'advproxy destination ports' => 'Порты назначения', 'advproxy download throttling' => 'Органичение скорости', 'advproxy enabled' => 'Разрешить', -'advproxy enabled' => 'Разрешить', 'advproxy enabled on' => 'Разрешить на', 'advproxy errmsg acl cannot be empty' => 'Список доступа не может быть пустым', 'advproxy errmsg auth cache ttl' => 'Неверное значение для кэша аутентификации TTL', @@ -372,7 +370,7 @@ 'backup explain key no1' => 'Вам следует сохранить этот ключь для восстановления на новых машинах, IPFire допускает только одноразовое создание/импорт ключа.', 'backup explain key no2' => 'floppy дискеты восстановления не связаны с этим ключом.', 'backup export key' => 'Экспорт ключа', -'backup extract key' => 'Извлеч ключ, +'backup extract key' => 'Извлеч ключ', 'backup from' => 'Восстановить из', 'backup generate key' => 'Генерировать ключ', 'backup import dat file' => 'Импортировать файл восстановления (.dat) ', @@ -536,6 +534,7 @@ 'could not open update information file' => 'Could not open update information file. The update file is corrupt.', 'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.', 'country' => 'Country', +'cpu frequency per' => 'CPU frequency per', 'cpu idle usage' => 'Idle CPU Usage', 'cpu interrupt usage' => 'Interrupt CPU Usage', 'cpu iowait usage' => 'CPU waiting for IO', @@ -1030,7 +1029,6 @@ 'invalid vpi vpci' => 'Invalid VPI/VPCI settings', 'invalid wins address' => 'Invalid WINS server address.', 'invert' => 'Инвертировать', -'invert' => 'Инвертировать', 'ip address' => 'IP адрес', 'ip address in use' => 'IP address already in use', 'ip address outside subnets' => 'IP Адрес находится за пределами подсети', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 87984cad1cd228a005b31d52483235915add715e
by git＠ipfire.org 01 Aug '11

01 Aug '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 87984cad1cd228a005b31d52483235915add715e (commit) from 878be1370e706afeb2ce539fdd15cdca0a6c3c90 (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 87984cad1cd228a005b31d52483235915add715e Author: Anton D. Seliverstov <compworm(a)ya.ru> Date: Mon Aug 1 18:15:29 2011 +0200 lang_ru: more strings translated and some fixes. ----------------------------------------------------------------------- Summary of changes: langs/ru/cgi-bin/ru.pl | 372 ++++++++++++++++++++++---------------------- langs/ru/install/lang_ru.c | 6 +- 2 files changed, 190 insertions(+), 188 deletions(-) Difference in files: diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 2488077..728d315 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -7,7 +7,7 @@ 'Add Rule' => 'Добавить правило', 'Async logging enabled' => 'Разрешить ассинхронную запись в файл логов', 'Choose Rule' => 'Укажите одно из следующих правил.', -'Class' => 'Class', +'Class' => 'Класс', 'Class was deleted' => 'Обнаружено с подклассами', 'Client status and controlc' => 'Статус и управление клиентами:', 'ConnSched action' => 'Действие:', @@ -17,6 +17,7 @@ 'ConnSched down' => 'Down', 'ConnSched ipsecstart' => 'IPSec (пере)запустить', 'ConnSched ipsecstop' => 'IPSec остановить', +'cpu frequency per' => 'CPU frequency per', 'ConnSched reconnect' => 'Переподключить', 'ConnSched scheduled actions' => 'Действия по расписанию', 'ConnSched scheduler' => 'Расписание', @@ -27,49 +28,49 @@ 'Enter TOS' => 'Включите или отключите TOS-bits т затем нажмите Сохранить.', 'Existing Files' => 'Файлы в базе данных', 'HDD temperature' => 'HDD temperature', -'Level7 Protocol' => 'Level7-Protocol', -'Level7 Rule' => 'Level7-Rule', -'Level7 rule' => 'Level7 rule', -'Local VPN IP' => 'Internal Network (GREEN):', +'Level7 Protocol' => 'Level7-Протокол', +'Level7 Rule' => 'Level7-Правило', +'Level7 rule' => 'Level7 правило', +'Local VPN IP' => 'Внутренняя сеть (GREEN):', 'MTU' => 'Размер MTU:', 'Number of IPs for the pie chart' => 'Число IP для круглых графиков', 'Number of Ports for the pie chart' => 'Число портов для круглых графиков', 'OVPN' => 'OpenVPN', 'OpenVPN' => 'OpenVPN', -'Pages' => 'Pages', -'Ping' => 'Ping :', -'Port Rule' => 'Port-Rule', +'Pages' => 'Страницы', +'Ping' => 'Пинг :', +'Port Rule' => 'Порт-Правило', 'QoS not enabled' => 'QoS не включен!', -'Queuelenght' => 'Queuelenght', -'Remote IP' => 'Remote IP / Hostname (DynDNS):', -'Remote VPN IP' => 'VPN Subnet (e.g. 10.0.10.0/255.255.255.0):', +'Queuelenght' => 'Длина очереди', +'Remote IP' => 'Удалённый IP / Имя хоста (DynDNS):', +'Remote VPN IP' => 'Подсеть VPN (то есть 10.0.10.0/255.255.255.0):', 'Resolv' => 'Resolv-Retry:', -'Scan for Files' => 'Scan for files', -'Scan from Directory' => 'Scan from directory', +'Scan for Files' => 'Найти файлы', +'Scan from Directory' => 'Найти каталог', 'Set time on boot' => 'Выставлять системное время на этапе загрузки машины', -'Subclass' => 'Subclass', -'TOS Bits' => 'TOS-Bits', -'TOS Rule' => 'TOS-Rule', -'TOS rule' => 'TOS rule', -'The class number does not match the specified interface.' => 'The class number does not match the specified interface.', -'The destination IP address is invalid.' => 'The destination IP address is invalid.', -'The source IP address is invalid.' => 'The source IP address is invalid.', -'Utilization on' => 'Utilization on', -'Verbose' => 'Verbose:', +'Subclass' => 'Подкласс', +'TOS Bits' => 'TOS-Биты', +'TOS Rule' => 'TOS-Правило', +'TOS rule' => 'TOS правило', +'The class number does not match the specified interface.' => 'Номер класса не соответствует указанному интерфейсу.', +'The destination IP address is invalid.' => 'IP адрес назначения задан неверно.', +'The source IP address is invalid.' => 'Исходный IP адрес задан неверно.', +'Utilization on' => 'Использовать на', +'Verbose' => 'Подробности:', 'WakeOnLan' => 'Wake On Lan', -'a ca certificate with this name already exists' => 'A CA certificate with this name already exists.', -'a connection with this common name already exists' => 'A connection with this common name already exists.', -'a connection with this name already exists' => 'A connection with this name already exists.', -'abort' => 'abort', -'access allowed' => 'Access allowed from:', -'access refused with this oinkcode' => 'Access refused with this Oink Code', -'accounting' => 'Accounting', -'accounting user nonpdc' => 'Accounting - none PDC Mode', -'accounting user pdc' => 'Accounting - PDC Mode', +'a ca certificate with this name already exists' => 'Сертификат CA с таким именем уже существует.', +'a connection with this common name already exists' => 'Соединение с таким именем уже существует.', +'a connection with this name already exists' => 'Соединение с таким именем уже существует.', +'abort' => 'Прервать', +'access allowed' => 'Доступ разрешён от:', +'access refused with this oinkcode' => 'Соединение отвергнуто с таким Oink кодом', +'accounting' => 'Учёт', +'accounting user nonpdc' => 'Учёт - без PDC режима', +'accounting user pdc' => 'Учёт - PDC режим', 'action' => 'Действие', -'activate' => 'Activate', -'activate user' => 'Activate user', -'active' => 'Active', +'activate' => 'Активировать', +'activate user' => 'Активировать пользователя', +'active' => 'Активен', 'add' => 'Добавить', 'add a host' => 'Добавить хост:', 'add a new rule' => 'Добавить новое правило:', @@ -78,25 +79,25 @@ 'add network' => 'Добавить сеть', 'add new alias' => 'Добавить новый псевдоним:', 'add new lease' => 'Добавить фиксированный IP', -'add new ovpn' => 'OpenVPN Settings:', +'add new ovpn' => 'Настройки OpenVPN:', 'add printer' => 'Добавить принтер', 'add service' => 'Добавить сервис', -'add share' => 'Add share', -'add subclass' => 'Add subclass', +'add share' => 'Добавить общий ресурс', +'add subclass' => 'Добавить подкласс', 'add user' => 'Добавить пользователя', -'add xtaccess' => 'Add External Access', -'add-route' => 'Additional push route', -'added from dhcp lease list' => 'Added from DHCP lease list', -'admin user password has been changed' => 'Admin user password has been changed.', -'admin users' => 'User with superuser rights', -'administrator user password' => 'Admin user password:', -'adsl settings' => 'ADSL settings', -'advanced' => 'Advanced', +'add xtaccess' => 'Добавить внешний доступ', +'add-route' => 'Дополнительный роутинг', +'added from dhcp lease list' => 'Добавлен из списка аренды DHCP', +'admin user password has been changed' => 'Пароль пользователя Admin был изменён.', +'admin users' => 'Пользователь с правами суперадминистратора', +'administrator user password' => 'Пароль пользователя Admin:', +'adsl settings' => 'Настройки ADSL', +'advanced' => 'Дополнительно', 'advanced server' => 'Дополнительные настройки сервера', -'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses', -'advproxy AUTH auth cache TTL' => 'Authentication cache TTL (in minutes)', -'advproxy AUTH global settings' => 'Global authentication settings', -'advproxy AUTH limit of IP addresses' => 'Limit of IP addresses per user', +'advproxy AUTH always required' => 'Требовать аутентификацию у незарегистрированных адресов', +'advproxy AUTH auth cache TTL' => 'Кэш аутентификации TTL (в минутах)', +'advproxy AUTH global settings' => 'Общие настройки аутентификации', +'advproxy AUTH limit of IP addresses' => 'Ограничение IP адресов на пользователя', 'advproxy AUTH method' => 'Метод Аутентификации', 'advproxy AUTH method ident' => 'identd', 'advproxy AUTH method ldap' => 'LDAP', @@ -104,31 +105,31 @@ 'advproxy AUTH method none' => 'Нет', 'advproxy AUTH method ntlm' => 'Windows', 'advproxy AUTH method radius' => 'RADIUS', -'advproxy AUTH no auth' => 'Domains without authentication (one per line)', -'advproxy AUTH number of auth processes' => 'Number of authentication processes', -'advproxy AUTH realm' => 'Authentication realm prompt', -'advproxy AUTH user IP cache TTL' => 'User/IP cache TTL (in minutes)', -'advproxy IDENT authorized users' => 'Authorized users (one per line)', +'advproxy AUTH no auth' => 'Домен без аутентификации (один на строчку)', +'advproxy AUTH number of auth processes' => 'Кол-во процессов аутентификации', +'advproxy AUTH realm' => 'Сообщение аутентификации', +'advproxy AUTH user IP cache TTL' => 'Пользовательский/IP кэш TTL (в минутах)', +'advproxy IDENT authorized users' => 'Авторизованные пользователи (один на строчку)', 'advproxy IDENT aware hosts' => 'Ident aware hosts (one per line)', 'advproxy IDENT identd settings' => 'Common identd settings', 'advproxy IDENT required' => 'Require identd authentication', 'advproxy IDENT timeout' => 'Ident timeout (in seconds)', -'advproxy IDENT unauthorized users' => 'Unauthorized users (one per line)', -'advproxy IDENT use negative access list' => 'Use negative access control', -'advproxy IDENT use positive access list' => 'Use positive access control', -'advproxy IDENT user based access restrictions' => 'User based access restrictions', +'advproxy IDENT unauthorized users' => 'Неавторизованные пользователи (один на строчку)', +'advproxy IDENT use negative access list' => 'Использовать пессимистический контроль доступа', +'advproxy IDENT use positive access list' => 'Использовать оптимистический контроль доступа', +'advproxy IDENT user based access restrictions' => 'Использовать пользовательские ограничения доступа', 'advproxy LDAP ADS' => 'Active Directory', 'advproxy LDAP NDS' => 'Novell eDirectory', 'advproxy LDAP V2' => 'LDAP version 2', 'advproxy LDAP V3' => 'LDAP version 3', -'advproxy LDAP auth' => 'LDAP authentication', +'advproxy LDAP auth' => 'LDAP Аутентификация', 'advproxy LDAP basedn' => 'Base DN', -'advproxy LDAP binddn password' => 'Bind DN password', -'advproxy LDAP binddn settings' => 'Bind DN settings', -'advproxy LDAP binddn username' => 'Bind DN username', +'advproxy LDAP binddn password' => 'Bind DN пароль', +'advproxy LDAP binddn settings' => 'Bind DN настройки', +'advproxy LDAP binddn username' => 'Bind DN пользователь', 'advproxy LDAP common settings' => 'Основные настройки LDAP', 'advproxy LDAP group access control' => 'Доступ для групп', -'advproxy LDAP group required' => 'Required group', +'advproxy LDAP group required' => 'Необходимая группа', 'advproxy LDAP port' => 'Порт', 'advproxy LDAP server' => 'LDAP сервер', 'advproxy LDAP type' => 'тип LDAP', @@ -159,8 +160,8 @@ 'advproxy NTLM domain settings' => 'Основные настройки Домена', 'advproxy NTLM unauthorized users' => 'Неавторизированные пользователи домена (один на строчку)', 'advproxy NTLM use integrated auth' => 'Разрешить встроенную в Windows аутентификацию', -'advproxy NTLM use negative access list' => 'Use negative access control', -'advproxy NTLM use positive access list' => 'Use positive access control', +'advproxy NTLM use negative access list' => 'Использовать пессимистический контроль доступа', +'advproxy NTLM use positive access list' => 'Использовать оптимистический контроль доступа', 'advproxy NTLM user based access restrictions' => 'User based access restrictions', 'advproxy RADIUS authorized users' => 'Authorized users (one per line)', 'advproxy RADIUS identifier' => 'Identifier', @@ -171,78 +172,79 @@ 'advproxy RADIUS unauthorized users' => 'Авторизированные пользователи (один на строчку)', 'advproxy RADIUS use negative access list' => 'Use negative access control', 'advproxy RADIUS use positive access list' => 'Use positive access control', -'advproxy RADIUS user based access restrictions' => 'User based access restrictions', +'advproxy RADIUS user based access restrictions' => 'Использовать пользовательские ограничения доступа', 'advproxy UA enable filter' => 'Разрешить проверку браузера', 'advproxy access' => 'Доступ', -'advproxy admin mail' => 'Cache administrator e-mail', -'advproxy advanced proxy' => 'Advanced Proxy', +'advproxy admin mail' => 'e-mail кэш администратора', +'advproxy advanced proxy' => 'Расширенный Proxy', 'advproxy advanced web proxy' => 'Настройки Web Proxy', -'advproxy advanced web proxy configuration' => 'Advanced web proxy configuration', +'advproxy advanced web proxy configuration' => 'Расширенные настройки web proxy', 'advproxy allowed subnets' => 'Разрешить подсети (одна на строчку)', -'advproxy allowed web browsers' => 'Allowed clients for web access', -'advproxy back to main page' => 'Back to main page', +'advproxy allowed web browsers' => 'Разрешённые клиенты для веб-доступа', +'advproxy back to main page' => 'Назад к главной странице', 'advproxy banned ip clients' => 'Заблокированные IP адреса (один на строчку)', 'advproxy banned mac clients' => 'Заблокированные MAC адреса (один на строчку)', -'advproxy cache management' => 'Cache management', +'advproxy cache management' => 'Контроль кэша', 'advproxy cache replacement policy' => 'Политика замены кэша', -'advproxy chgwebpwd ERROR' => 'E R R O R :', -'advproxy chgwebpwd SUCCESS' => 'S U C C E S S :', -'advproxy chgwebpwd change password' => 'Change password', -'advproxy chgwebpwd change web password' => 'C h a n g e   w e b   a c c e s s   p a s s w o r d', -'advproxy chgwebpwd new password' => 'New password', -'advproxy chgwebpwd new password confirm' => 'New password (confirm)', -'advproxy chgwebpwd old password' => 'Current password', +'advproxy chgwebpwd ERROR' => 'О Ш И Б К А :', +'advproxy chgwebpwd SUCCESS' => 'У С П Е Х :', +'advproxy chgwebpwd change password' => 'Сменить пароль', +'advproxy chgwebpwd change web password' => 'С м е н и т ь   п а р о л ь   в е б   д о с т у п а', +'advproxy chgwebpwd new password' => 'Новый пароль', +'advproxy chgwebpwd new password confirm' => 'Новый пароль (подтвердить)', +'advproxy chgwebpwd old password' => 'Текущий пароль', 'advproxy chgwebpwd username' => 'Имя пользователя', 'advproxy classroom extensions' => 'Classroom extensions', 'advproxy clear cache' => 'Очистить Кэш', 'advproxy client IP forwarding' => 'перенаправлять IP адреса клиентов', 'advproxy common settings' => 'Базовые настройки', 'advproxy content based throttling' => 'Ориентироваться на контент', -'advproxy cre disabled' => 'The management interface has been disabled by the administrator', +'advproxy cre disabled' => 'Интерфейс управления был отключён администратором', 'advproxy cre group definitions' => 'Classroom group definitions', -'advproxy cre supervisors' => 'Supervisor IP addresses (one per line)', +'advproxy cre supervisors' => 'IP адреса ответственных (один на строчку)', 'advproxy destination ports' => 'Порты назначения', 'advproxy download throttling' => 'Органичение скорости', 'advproxy enabled' => 'Разрешить', +'advproxy enabled' => 'Разрешить', 'advproxy enabled on' => 'Разрешить на', -'advproxy errmsg acl cannot be empty' => 'Access control list cannot be empty', -'advproxy errmsg auth cache ttl' => 'Invalid value for authentication cache TTL', -'advproxy errmsg auth children' => 'Invalid number of authentication processes', -'advproxy errmsg auth ipcache may not be null' => 'Authentication cache TTL may not be 0 when using IP address limits', -'advproxy errmsg auth ipcache ttl' => 'Invalid value for user/IP cache TTL', -'advproxy errmsg change fail' => 'Password could not be changed', -'advproxy errmsg change success' => 'Password for web access sucessfully changed', -'advproxy errmsg hdd cache size' => 'Invalid value for harddisk cache size (min 10 MB required)', +'advproxy errmsg acl cannot be empty' => 'Список доступа не может быть пустым', +'advproxy errmsg auth cache ttl' => 'Неверное значение для кэша аутентификации TTL', +'advproxy errmsg auth children' => 'Неверное кол-во процессов аутентификации', +'advproxy errmsg auth ipcache may not be null' => 'Кэш аутентификации TTL не может быть 0 когда используются ограницения IP адресов', +'advproxy errmsg auth ipcache ttl' => 'Неверное значение для пользовательского/IP кэша TTL', +'advproxy errmsg change fail' => 'Пароль не может быть изменён', +'advproxy errmsg change success' => 'Пароль веб-доступа успешно изменён', +'advproxy errmsg hdd cache size' => 'Неверное значение кэша жёсткого диска (требуется мин. 10 MB)', 'advproxy errmsg ident timeout' => 'Invalid ident timeout', -'advproxy errmsg invalid bdc' => 'Invalid hostname for backup domain controller', -'advproxy errmsg invalid destination port' => 'Invalid destination port', +'advproxy errmsg invalid bdc' => 'Неверное имя хоста для контролера домена бекапа', +'advproxy errmsg invalid destination port' => 'Неверный порт назначения', 'advproxy errmsg invalid ip or mask' => 'Неверно указан IP адрес или маска подсети', 'advproxy errmsg invalid mac' => 'Неверно указан MAC адрес', -'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller', -'advproxy errmsg invalid proxy port' => 'Invalid proxy port', -'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', +'advproxy errmsg invalid pdc' => 'Неверное имя хоста для основного контролера домена', +'advproxy errmsg invalid proxy port' => 'Неверный порт proxy', +'advproxy errmsg invalid upstream proxy username or password setting' => 'Неверное имя или пароль для исходящего proxy', 'advproxy errmsg invalid user' => 'Данное имя пользователя не существует', 'advproxy errmsg ldap base dn' => 'LDAP base DN required', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required', -'advproxy errmsg ldap port' => 'Invalid LDAP port number', -'advproxy errmsg ldap server' => 'Invalid IP address for LDAP Server', +'advproxy errmsg ldap port' => 'Неверный номер порта LDAP', +'advproxy errmsg ldap server' => 'Неверный IP адрес для LDAP сервера', 'advproxy errmsg max userip' => 'Неправильное количество IP адресов на пользователя', -'advproxy errmsg mem cache size' => 'Invalid value for memory cache size', -'advproxy errmsg no browser' => 'At least one browser or client must be selected for web access', +'advproxy errmsg mem cache size' => 'Неверно задан размер кэша памяти', +'advproxy errmsg no browser' => 'Как минимум один браузер или клиент должен быть указан для веб доступа', 'advproxy errmsg no password' => 'Поле пароля не может быть пустым', 'advproxy errmsg no username' => 'Имя пользователя не может быть пустым', -'advproxy errmsg non-transparent proxy required' => 'Web proxy must be running in non-transparent mode for authentication', -'advproxy errmsg ntlm domain' => 'Windows domain name required', -'advproxy errmsg ntlm pdc' => 'Hostname for primary domain controller required', -'advproxy errmsg password incorrect' => 'Password incorrect', -'advproxy errmsg password length' => 'Invalid value for password length', -'advproxy errmsg password length 1' => 'Password must have at least ', -'advproxy errmsg password length 2' => ' characters', -'advproxy errmsg passwords different' => 'Passwords don\'t match', -'advproxy errmsg radius port' => 'Invalid RADIUS port number', -'advproxy errmsg radius secret' => 'RADIUS shared secret required', -'advproxy errmsg radius server' => 'Invalid IP address for RADIUS Server', -'advproxy errmsg time restriction' => 'Invalid time restriction', +'advproxy errmsg non-transparent proxy required' => 'Для аутентификации proxy должен работать в непрозрачном режиме', +'advproxy errmsg ntlm domain' => 'Требуется имя домена Windows', +'advproxy errmsg ntlm pdc' => 'Требуется имя хоста для основного контролера домена', +'advproxy errmsg password incorrect' => 'Неверный пароль', +'advproxy errmsg password length' => 'Неверная длина пароля', +'advproxy errmsg password length 1' => 'Пароль должен иметь как минимум ', +'advproxy errmsg password length 2' => ' символов', +'advproxy errmsg passwords different' => 'Пароли не совпадают', +'advproxy errmsg radius port' => 'Неверный номер порта RADIUS', +'advproxy errmsg radius secret' => 'Требуется публичный ключ RADIUS', +'advproxy errmsg radius server' => 'Неверный IP адрес для RADIUS сервера', +'advproxy errmsg time restriction' => 'Неверное ограничение по времени', 'advproxy error design' => 'Оформление ошибок', 'advproxy error language' => 'Язык, на котором отображаются ошибки', 'advproxy fake referer' => 'Липовый referer Для внешних сайтов', @@ -265,15 +267,15 @@ 'advproxy monday' => 'Пон', 'advproxy network based access' => 'Контроль подсетей', 'advproxy no cache sites' => 'Не кэшировать следующие домены (один на строчку)', -'advproxy no clients defined' => 'No clients defined', +'advproxy no clients defined' => 'Клиенты не определены', 'advproxy no connection auth' => 'No connection oriented authentication forwarding', 'advproxy no cre groups' => 'There are no access groups available', 'advproxy no internal proxy on blue' => 'Запретить внутренний proxy доступ из BLUE к другим подсетям', 'advproxy no internal proxy on green' => 'Запретить внутренний proxy доступ к GREEN из других подсетей', 'advproxy number of L1 dirs' => 'Кол-во level-1 subdirectories', -'advproxy off' => 'Proxy off', +'advproxy off' => 'Proxy выкл', 'advproxy offline mode' => 'Включить автономный режим', -'advproxy on' => 'Proxy on', +'advproxy on' => 'Proxy вкл', 'advproxy privacy' => 'Приватность', 'advproxy proxy port' => 'Порт Proxy', 'advproxy ram cache size' => 'Размер памяти кэша (MB)', @@ -288,7 +290,7 @@ 'advproxy standard' => 'Standard', 'advproxy standard ports' => 'Разрешить стандартные порты (один на строчку)', 'advproxy sunday' => 'Воск', -'advproxy supervisor password' => 'Supervisor password', +'advproxy supervisor password' => 'Пароль ответственного', 'advproxy suppress version' => 'Игнорировать версии', 'advproxy throttle binary' => 'Бинарные файлы', 'advproxy throttle dskimg' => 'Образы CD', @@ -306,8 +308,8 @@ 'advproxy unrestricted ip clients' => 'Неограниченные IP адреса (один на строчку)', 'advproxy unrestricted mac clients' => 'Неограниченные MAC адреса (один на строчку)', 'advproxy update accelerator' => 'Ускоритель обновления', -'advproxy update information' => 'There is an updated version available for download. Visit <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> for more information.', -'advproxy update notification' => 'Update notification!', +'advproxy update information' => 'Доступна новая версия для загрузки. Зайдите на <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> для получения информации.', +'advproxy update notification' => 'Сообщение об обновлении!', 'advproxy upstream password' => 'Пароль на выход', 'advproxy upstream proxy' => 'Исходящий proxy', 'advproxy upstream proxy host:port' => 'Исходящий proxy (хост:порт)', @@ -319,13 +321,13 @@ 'advproxy web browser' => 'Веб Браузер: ', 'advproxy wednesday' => 'Ср', 'again' => 'Ещё раз:', -'aktiv' => 'Active', -'album' => 'Album', -'alcatelusb help' => 'To utilise the Speedtouch 330 or Speedtouch USB modem you must upload the firmware to your IPFire box. Please download the Embedded Firmware package for SpeedTouch 330 from speedtouch.com, unzip and then upload the appropriate file for your modem : KQD6_3.xxx when Rev<4 or ZZZL_3.xxx for Rev=4 using the form below.', -'alcatelusb upload' => 'Upload Speedtouch USB firmware', +'aktiv' => 'Активен', +'album' => 'Альбом', +'alcatelusb help' => 'Для использования SpeedTouch 330 или SpeedTouch USB modem Вам придётся загрузить драйвера на IpFire. Пожалуйста загрузите the External Firmware для SpeedTouch 330 с сайта speedtouch.com, разархивируйте и затем загрузите правильный файл для Вашего модема : KQD6_3.xxx when Rev<4 или ZZZL_3.xxx для Rev=4 с помощью формы ниже.', +'alcatelusb upload' => 'загрузить Speedtouch USB firmware', 'alias ip' => 'Псевдоним IP', 'aliases' => 'Псевдонимы', -'aliases not active' => 'Aliases will not be active unless your RED interface is STATIC', +'aliases not active' => 'Псевдонимы не будут использованы пока ваш RED интерфейс СТАТИЧЕСКИЙ', 'all' => 'Все', 'all interfaces' => 'Все интерфейсы', 'all services' => 'Все Сервисы', @@ -339,17 +341,17 @@ 'alt proxy' => 'Proxy', 'alt services' => 'Сервисы', 'alt system' => 'Система', -'alt vpn' => 'VPNs', -'and' => 'And', -'ansi t1.483' => 'TO BE REMOVED', -'apcupsd' => 'APC-UPS status', -'apply' => 'Apply now', +'alt vpn' => 'VPN\'ы', +'and' => 'и', +'ansi t1.483' => 'БУДЕТ УДАЛЕНО', +'apcupsd' => 'APC-UPS статус', +'apply' => 'Применить сейчас', 'april' => 'Апрель', -'archive not exist' => 'Configuration archive does not exist', +'archive not exist' => 'Архив с конфигурацией не существует', 'are you sure' => 'Вы уверены?', 'arp table entries' => 'Записи ARP-таблицы:', 'artist' => 'Artist', -'attemps' => 'Attempts', +'attemps' => 'Попытки', 'august' => 'Август', 'authentication' => 'Аутентификация:', 'automatic' => 'Автоматически', @@ -358,55 +360,55 @@ 'avoid dod' => 'Не используйте эту опцию с дозвоном по требованию! Обычно используется, когда IPFire находится за роутером. Ваш RED IP должен находиться в одной из трёх зарезервированных сетей то есть 10/8, 172.16/12, 192.168/16', 'back' => 'НАЗАД', 'backup' => 'Резервная копия системы', -'backup archive' => 'Backup File (.dat)', -'backup clear archive' => 'Clear Backup File (.gz)', -'backup config floppy' => 'Backup Configuration - Floppy Disk', -'backup configuration' => 'Backup Configuration:', +'backup archive' => 'Backup файл (.dat)', +'backup clear archive' => 'Очистить Backup файл (.gz)', +'backup config floppy' => 'Конфигурация Backup - Floppy диск', +'backup configuration' => 'Конфигурация Backup:', 'backup erase key' => 'Удалить ключ', -'backup explain key' => 'Backup are encrypted using a key. To avoid illegal backup manipulations, IPFire only restores a backup that is encrypted with the key you will specify here. You have three options available to you', +'backup explain key' => 'Восстановительные копии шифруются. Для предотвращения незаконного доступа к таким файлам, IPFire восстанавливает только файлы по указанному здесь ключу. Предусмотрено три варианта', 'backup explain key li1' => 'Позволить IPFire создать ключ для Вас.', 'backup explain key li2' => 'Импортировать сохранённый ключ (возможно, защищённый паролем).', 'backup explain key li3' => 'Извлеч ключь из незашифрованного резервного файла (только версии 1.4.10).', -'backup explain key no1' => 'you should save this key if you plan to restore new machines, IPFire accepts only once key creation/import.', -'backup explain key no2' => 'legacy floppy backups are not concerned with this key.', -'backup export key' => 'Export key', -'backup extract key' => 'Extract key', -'backup from' => 'Backup from', -'backup generate key' => 'Generate key', -'backup import dat file' => 'Import a backup (.dat) file', -'backup import key' => 'Import key', -'backup key' => 'Backup Encryption Key', -'backup key file' => 'Backup key file', -'backup key info' => 'IPFire restricts access to the backup key, thus you must know root password. You have possibility to protect this key outside of IPFire with a password.', -'backup media info' => 'Floppy and/or unformatted media may display stranges partitions sizes. In this case, select the whole device. Remenber to mount harddisk before removing device. Note: floppy created here are not usable with IPFire installer program!', -'backup missing key' => 'Need the backup key to restore a set', -'backup password' => 'Backup password', -'backup protect key password' => 'Backup key password', -'backup sets' => 'Backup sets', -'backup to floppy' => 'Backup to floppy', +'backup explain key no1' => 'Вам следует сохранить этот ключь для восстановления на новых машинах, IPFire допускает только одноразовое создание/импорт ключа.', +'backup explain key no2' => 'floppy дискеты восстановления не связаны с этим ключом.', +'backup export key' => 'Экспорт ключа', +'backup extract key' => 'Извлеч ключ, +'backup from' => 'Восстановить из', +'backup generate key' => 'Генерировать ключ', +'backup import dat file' => 'Импортировать файл восстановления (.dat) ', +'backup import key' => 'Импортировать ключ', +'backup key' => 'Ключ шифрования файлов восстановления', +'backup key file' => 'Файл ключа восстановления', +'backup key info' => 'IPFire запрещает доступ к файлу восстановления, для этого Вам необходим пароль root. У вас так же есть возможность защитить ключ дополнительным паролем вне IPFire.', +'backup media info' => 'Floppy и/или неотформатированный носитель может неверно сообщать размер своих разделов. В этом случае укажите всё устройство. Не забудьте смонтировать жёсткие диски до удаления устройства. Обратите внимание: floppy созданные здесь не могут использоваться с установщиком IPFire!', +'backup missing key' => 'Нужен ключ для восстановления', +'backup password' => 'Пароль восстановления', +'backup protect key password' => 'Пароль ключа восстановления', +'backup sets' => 'Наборы для восстановления', +'backup to floppy' => 'Сохранить на floppy', 'backupaddon' => 'Резервная копия аддонов', -'backupprofile' => 'In case reconnection fails, switch to profile', +'backupprofile' => 'Если не получается переподключиться, укажите другой профиль', 'backups' => 'Резервные копии', 'backupwarning' => 'Пожалуйста, сперва восстановите резервную копию системы, а затем аддоны. Пожалуйста сохраните оригинальное название файла, которое было при скачивании.', -'bad characters in' => 'Bad characters in ', -'bad characters in script field' => 'Bad characters in script field', -'bad characters in the telephone number field' => 'Bad characters in the telephone number field.', -'bad destination range' => 'The Destination port range has a first value that is greater than or equal to the second value.', +'bad characters in' => 'Неправильные символы в ', +'bad characters in script field' => 'Неправильные символы в поле скрипта', +'bad characters in the telephone number field' => 'Неправильные символы в поле телефонного номера.', +'bad destination range' => 'В диапазоне портов назначения номер начального порт больше конечного.', 'bad ignore filter' => 'Неправильный фильтр игнора:', -'bad return code' => 'Helper program returned error code', -'bad source range' => 'The Source port range has a first value that is greater than or equal to the second value.', +'bad return code' => 'Программа помощи сообщает об ошибке', +'bad source range' => 'В диапазоне исходящих портов номер начального порт больше конечного.', 'bandwidth usage' => 'Внешний трафик', -'bandwitherror' => 'You cannot change the bandwithsettings, with Qos being enabled. First disable Qos.', +'bandwitherror' => 'Вы не сможете поменять пропускную способность, пока работает Qos. Сперва остановите Qos.', 'bandwithsettings' => 'Настройка пропускной способности', 'basic options' => 'Основные опции', 'beep when ppp connects or disconnects' => 'Пищать спикером, когда IPFire подключается и отключается', 'behind a proxy' => 'За proxy:', -'bewan adsl pci st' => 'TO BE REMOVED', -'bewan adsl usb' => 'TO BE REMOVED', -'bitrate' => 'Bitrate', +'bewan adsl pci st' => 'БУДЕТ УДАЛЁН', +'bewan adsl usb' => 'БУДЕТ УДАЛЁН', +'bitrate' => 'Битрейд', 'bleeding rules' => 'Bleeding Edge Snort Rules', 'blue' => 'BLUE', -'blue access' => 'Blue Access', +'blue access' => 'Доступ к Blue', 'blue access use hint' => 'You have to enter the MAC or the IP Address for a device. To enter both is also possible', 'blue interface' => 'Blue Интерфейс', 'broadcast' => 'Broadcast', @@ -417,7 +419,7 @@ 'bytes received' => 'Bytes Received', 'bytes sent' => 'Bytes Sent', 'ca certificate' => 'CA Certificate', -'ca name' => 'CA name', +'ca name' => 'Имя CA', 'cache management' => 'Управление Кэшем', 'cache size' => 'Cache size (MB):', 'cached' => 'cached', @@ -534,7 +536,6 @@ 'could not open update information file' => 'Could not open update information file. The update file is corrupt.', 'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.', 'country' => 'Country', -'cpu frequency per' => 'CPU frequency per', 'cpu idle usage' => 'Idle CPU Usage', 'cpu interrupt usage' => 'Interrupt CPU Usage', 'cpu iowait usage' => 'CPU waiting for IO', @@ -906,8 +907,8 @@ 'holdoff' => 'Holdoff time (in seconds)', 'host' => 'Host', 'host allow' => 'list with allowed hosts', -'host certificate' => 'Host Certificate', -'host configuration' => 'Host Configuration', +'host certificate' => 'Хост сертификат', +'host configuration' => 'Конфигурация хоста', 'host deny' => 'list with denied hosts', 'host ip' => 'IP адрес хоста', 'host to net vpn' => 'Host-to-Net Virtual Private Network (RoadWarrior)', @@ -1029,6 +1030,7 @@ 'invalid vpi vpci' => 'Invalid VPI/VPCI settings', 'invalid wins address' => 'Invalid WINS server address.', 'invert' => 'Инвертировать', +'invert' => 'Инвертировать', 'ip address' => 'IP адрес', 'ip address in use' => 'IP address already in use', 'ip address outside subnets' => 'IP Адрес находится за пределами подсети', @@ -1191,8 +1193,8 @@ 'modem on com5' => 'Modem on COM5', 'modem settings have errors' => 'Modem settings have errors', 'modem speaker on' => 'Modem speaker on:', -'modify' => 'Modify', -'modulation' => 'Modulation', +'modify' => 'Изменить', +'modulation' => 'Модуляция', 'monday' => 'Понедельник', 'month' => 'Месяц', 'monthly firewallhits' => 'monthly firewallhits', @@ -1256,7 +1258,7 @@ 'no cfg upload' => 'No data was uploaded', 'no dhcp lease' => 'No DHCP lease has been acquired', 'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.', -'no filter pass' => 'Enter the standard class for non-filtered packets.', +'no filter pass' => 'Задайте стандартный класс для нефильтруемых пакетов.', 'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.', 'no information available' => 'No information available.', 'no log selected' => 'No log selected', @@ -1384,19 +1386,19 @@ 'pakfire installed addons' => 'Установленные Аддоны:', 'pakfire last core list update' => 'Обновление core-списков', 'pakfire last package update' => 'Обновление списка пакетов', -'pakfire last serverlist update' => 'Обновление серверних списков', +'pakfire last serverlist update' => 'Обновление серверных списков', 'pakfire last update' => 'Последнее обновление', 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.', 'pakfire register' => 'Регистрировать на pakfire-сервере:', 'pakfire system state' => 'Статус системы', 'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и нажмите минус для удаления.', -'pakfire uninstall package' => 'You want to uninstall the following packages: ', +'pakfire uninstall package' => 'Вы собираетесь удалить следующие пакеты: ', 'pakfire update daily' => 'Ежедневный поиск обновлений:', -'pakfire updates' => 'Available Update:', -'pakfire working' => 'Pakfire is working ... Please wait until all operations have completed successfully.', -'pap or chap' => 'PAP or CHAP', -'parentclass' => 'Parentclass', -'parentclass add' => 'Add parentclass', +'pakfire updates' => 'Доступное обновление:', +'pakfire working' => 'Pakfire работает ... Пожалуйста дождитесь успешного завершения процедуры.', +'pap or chap' => 'PAP или CHAP', +'parentclass' => 'Родительский класс', +'parentclass add' => 'Добавить родительский класс', 'password' => 'Пароль:', 'password contains illegal characters' => 'Password contains illegal characters.', 'password crypting key' => 'Password crypting the key', @@ -1464,11 +1466,11 @@ 'proxy port' => 'Порт Proxy', 'proxy reconfigure' => 'Сохранить и перезапустить', 'psk' => 'PSK', -'pulse' => 'Pulse', -'pulse dial' => 'Pulse dial:', -'qos add subclass' => 'Add subclass', +'pulse' => 'Импульсный', +'pulse dial' => 'Импульсный набор:', +'qos add subclass' => 'Добавить подкласс', 'qos graphs' => 'Qos Graphs', -'qos warning' => 'The rule must be saved, otherwise it will be discarded!', +'qos warning' => 'Правило должно быть сохранено, иначе оно исчезнет совсем!', 'quick control' => 'Quick Control', 'quick playlist' => 'Quick Playlist', 'ram' => 'RAM', @@ -1526,7 +1528,7 @@ 'restore settings' => 'Reset Settings', 'reverse sort' => 'Сортировать в обратном хронологическом порядке', 'root' => 'Root', -'root certificate' => 'Root certificate', +'root certificate' => 'Сертификат Root', 'root path' => 'Путь от корневой директории', 'root user password' => 'Root пароль', 'route subnet is invalid' => 'Additional push route subnet is invalid', @@ -1718,7 +1720,7 @@ 'thursday' => 'Четверг', 'time' => 'Время', 'time date manually reset' => 'Ручной сброс Времени/Даты.', -'time server' => 'Сервер времени', +'time server' => 'Сервер времени NTP', 'timeout must be a number' => 'Таймаут должен быть числом.', 'title' => 'Заголовок', 'to' => 'До', @@ -1795,7 +1797,7 @@ 'updxlrtr cancel download' => 'Cancel download', 'updxlrtr children' => 'Number of accelerator processes', 'updxlrtr common settings' => 'Основные настройки', -'updxlrtr condition download' => 'Download', +'updxlrtr condition download' => 'Закачка', 'updxlrtr condition nosource' => 'No source', 'updxlrtr condition ok' => 'Последний', 'updxlrtr condition outdated' => 'Устарел', @@ -1857,7 +1859,7 @@ 'upgrade' => 'Апгрейд', 'uplink speed' => 'Исходящая скорость подключения (kbit/sec)', 'uplink std class' => 'uplink standard class', -'upload' => 'Upload', +'upload' => 'Отдача', 'upload a certificate' => 'Upload a certificate:', 'upload a certificate request' => 'Upload a certificate request:', 'upload ca certificate' => 'Загрузить CA сертификат', @@ -2124,7 +2126,7 @@ 'vpn subjectaltname' => 'Subject Alt Name', 'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)', 'vpn watch' => 'Перезапускать net-to-net vpn когда удалённый IP меняется (dyndns).', -'waiting to synchronize clock' => 'Ждать синхронизации', +'waiting to synchronize clock' => 'Ожидается синхронизация', 'warn when traffic reaches' => 'Предупреждать когда трафик возрастает до x %', 'warning messages' => 'Warning messages', 'was deleted' => 'was deleted', diff --git a/langs/ru/install/lang_ru.c b/langs/ru/install/lang_ru.c index a51852f..1e96b61 100644 --- a/langs/ru/install/lang_ru.c +++ b/langs/ru/install/lang_ru.c @@ -252,7 +252,7 @@ char *ru_tr[] = { /* TR_KEYBOARD_MAPPING */ "Раскладка клавиатуры", /* TR_KEYBOARD_MAPPING_LONG */ -"Укажите тип используемой клавиатуры из списка ниже.", +"Укажите тип используемой клавиатуры из списка ниже. (обычно подходит ru_win )", /* TR_LEASED_LINE */ "Зарезервированная строка", /* TR_LOADING_MODULE */ @@ -398,7 +398,7 @@ char *ru_tr[] = { /* TR_SECTION_MENU */ "Меню разделов", /* TR_SELECT */ -"Выделить", +"Выбрать", /* TR_SELECT_CDROM_TYPE */ "Выделить тип CDROM", /* TR_SELECT_CDROM_TYPE_LONG */ @@ -446,7 +446,7 @@ char *ru_tr[] = { /* TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED */ "Модуль этого драйвера уже установлен.", /* TR_TIMEZONE */ -"Временная зона", +"Часовой пояс", /* TR_TIMEZONE_LONG */ "Укажите свою временную зону из списка ниже.", /* TR_UNABLE_TO_EJECT_CDROM */ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fdd425b9a197cf4cc0068eeb2a01ffbf90a821c9
by git＠ipfire.org 01 Aug '11

01 Aug '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 fdd425b9a197cf4cc0068eeb2a01ffbf90a821c9 (commit) via 66d27fb3ab97ad5c481b67af456a62d2bb1824fb (commit) via 803dc34f90f8504c231fb5f663640d4d39a9fdd9 (commit) via b2eea8f632d4d9f59fca0163692ed91a6d854cc4 (commit) from 4c528699d890e109beddde481ec64d11f376f902 (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 fdd425b9a197cf4cc0068eeb2a01ffbf90a821c9 Merge: 66d27fb 4c52869 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 1 17:14:00 2011 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 66d27fb3ab97ad5c481b67af456a62d2bb1824fb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 1 15:34:58 2011 +0200 basesystem: Add dependency to filesystem package. commit 803dc34f90f8504c231fb5f663640d4d39a9fdd9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 1 15:33:16 2011 +0200 filesystem: New package. Package, which created the basic directory layout on an IPFire system. commit b2eea8f632d4d9f59fca0163692ed91a6d854cc4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 1 15:32:38 2011 +0200 build-essentials: Add option to disable directory check. This is needed for the filesystem package. ----------------------------------------------------------------------- Summary of changes: pkgs/basesystem/basesystem.nm | 6 +- pkgs/build-essentials/build-essentials.nm | 2 +- .../buildsystem-tools/functions-directories | 4 + pkgs/build-essentials/buildsystem/Constants | 2 + .../quality-agent.d/095-directory-layout | 5 + pkgs/{setup/setup.nm => filesystem/filesystem.nm} | 92 ++++++++++++++----- 6 files changed, 83 insertions(+), 28 deletions(-) copy pkgs/{setup/setup.nm => filesystem/filesystem.nm} (52%) Difference in files: diff --git a/pkgs/basesystem/basesystem.nm b/pkgs/basesystem/basesystem.nm index d4bec5c..ec7780a 100644 --- a/pkgs/basesystem/basesystem.nm +++ b/pkgs/basesystem/basesystem.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = basesystem PKG_VER = 2.99 -PKG_REL = 1 +PKG_REL = 2 PKG_EPOCH = 1 PKG_ARCH = noarch @@ -41,8 +41,8 @@ PKG_BUILD_DEPS = # There are no build dependencies # This is a package that pulls lots of other dependencies to always have a # 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 setup \ + coreutils file filesystem findutils gawk grep iana-etc initscripts kbd \ + less module-init-tools network pakfire passwd procps psmisc sed setup \ shadow syslog system-release tar udev util-linux vim define PKG_DESCRIPTION diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index e29fa42..01cd863 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials -PKG_VER = 1.0 +PKG_VER = 1.1 PKG_REL = 1 PKG_EPOCH = 2 PKG_ARCH = noarch diff --git a/pkgs/build-essentials/buildsystem-tools/functions-directories b/pkgs/build-essentials/buildsystem-tools/functions-directories index e779d75..700321c 100644 --- a/pkgs/build-essentials/buildsystem-tools/functions-directories +++ b/pkgs/build-essentials/buildsystem-tools/functions-directories @@ -5,6 +5,10 @@ function dir_is_empty() { } function directory_remove_orphans() { + if [ "${QUALITY_AGENT_NO_DIRECTORY_PRUNE}" = "yes" ]; then + return + fi + local basedir=${1} log DEBUG "Removing orphans in ${basedir}" diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants index d46d5f3..65aa2ae 100644 --- a/pkgs/build-essentials/buildsystem/Constants +++ b/pkgs/build-essentials/buildsystem/Constants @@ -170,3 +170,5 @@ export QUALITY_AGENT_WHITELIST_NX export QUALITY_AGENT_WHITELIST_RPATH export QUALITY_AGENT_WHITELIST_SONAME export QUALITY_AGENT_WHITELIST_SYMLINK +export QUALITY_AGENT_NO_DIRECTORY_CHECK +export QUALITY_AGENT_NO_DIRECTORY_PRUNE diff --git a/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout b/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout index 14f600d..3f946a1 100755 --- a/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout +++ b/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout @@ -7,6 +7,11 @@ DESC="The filelayout should comply to the FHS." DIRS="/etc/init.d /etc/rc.d /lib/pkgconfig /usr/etc /usr/libexec /usr/local /usr/man /usr/usr /usr/var" function check() { + # Do nothing, if directory check was disabled. + if [ "${QUALITY_AGENT_NO_DIRECTORY_CHECK}" = "yes" ]; then + return 0 + fi + local failed=0 local dir diff --git a/pkgs/filesystem/filesystem.nm b/pkgs/filesystem/filesystem.nm new file mode 100644 index 0000000..7c7115b --- /dev/null +++ b/pkgs/filesystem/filesystem.nm @@ -0,0 +1,110 @@ +############################################################################### +# # +# 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 = filesystem +PKG_VER = 001 +PKG_REL = 1 + +PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> +PKG_GROUPS = Base System/Base +PKG_URL = +PKG_LICENSE = Public Domain +PKG_SUMMARY = The basic directory layout for a Linux system. + +PKG_BUILD_DEPS = build-essentials>=2:1.1-1 +PKG_PREREQUIRES += setup + +define PKG_DESCRIPTION + The filesystem package is one of the basic packages that is installed + on a Linux system. Filesystem contains the basic directory layout + for a Linux operating system, including the correct permissions for + the directories. +endef + +DIR_APP = $(DIR_SRC) + +QUALITY_AGENT_NO_DIRECTORY_CHECK = yes +QUALITY_AGENT_NO_DIRECTORY_PRUNE = yes + +STAGE_BUILD = # Nothing to do + +define STAGE_INSTALL + cd $(BUILDROOT) && mkdir -pv \ + bin \ + boot \ + dev \ + etc/pki \ + etc/skel \ + etc/sysconfig \ + home \ + lib/modules \ + media \ + mnt \ + opt \ + proc \ + root \ + run/lock \ + sbin \ + srv \ + sys \ + tmp \ + usr/bin \ + usr/include \ + usr/lib \ + usr/lib/locale \ + usr/sbin \ + usr/share/{aclocal,dict,doc,empty,info,mime-info,misc} \ + usr/share/man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p} \ + usr/src \ + usr/local/bin \ + usr/local/etc \ + usr/local/lib \ + usr/local/sbin \ + usr/local/share \ + usr/local/share/man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x} \ + usr/local/share/info \ + usr/local/include \ + var/empty \ + var/lib \ + var/local \ + var/lock/subsys \ + var/log \ + var/nis \ + var/preserve \ + var/run \ + var/spool/{mail,lpd} \ + var/tmp \ + var/db \ + var/cache + + cd $(BUILDROOT) && ln -snf ../var/tmp usr/tmp + cd $(BUILDROOT) && ln -snf spool/mail var/mail + + # Setting correct permissions. + chmod 1777 $(BUILDROOT)/{,var/}tmp + chown root:mail $(BUILDROOT)/var/spool/mail + chmod 775 $(BUILDROOT)/var/spool/mail +endef 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 August 2011