IPFire-SCM May 2011

ipfire-scm@lists.ipfire.org

1 participants
63 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1eaa29b151b6b923041e612f7f0c588b44dbdbeb
by git＠ipfire.org 31 May '11

31 May '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0df2024f29c9e955dd0bfe4df84afce757d40e26
by git＠ipfire.org 31 May '11

31 May '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 0df2024f29c9e955dd0bfe4df84afce757d40e26 (commit) via 156337976b33ca58a94b6a4fbb03bae7f1b9b38b (commit) via 1fa96194abe35c08d77ba713877db96f31dee72e (commit) via ddb6262fe588a487f61c8565b399f480b46932ce (commit) via 20730a6feee96496d4933fc2cba54e0c87b7ef84 (commit) from 63ca66d438520e9c613922e4f419ed50eaf1bc6c (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 0df2024f29c9e955dd0bfe4df84afce757d40e26 Merge: 63ca66d 1563379 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Tue May 31 22:27:53 2011 +0200 Merge branch 'master' into next commit 156337976b33ca58a94b6a4fbb03bae7f1b9b38b Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Mon May 30 18:14:42 2011 +0200 extrahd.cgi: French translation. Thx Lalsacien! commit 1fa96194abe35c08d77ba713877db96f31dee72e Merge: ddb6262 9a5f5d3 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Mon May 30 18:10:04 2011 +0200 Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x commit ddb6262fe588a487f61c8565b399f480b46932ce Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Fri May 27 14:03:08 2011 +0200 extrahd.cgi: insert new translation strings. commit 20730a6feee96496d4933fc2cba54e0c87b7ef84 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Fri May 27 14:00:57 2011 +0200 extrahd.cgi: removed controller names from list, corrected translation. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/extrahd.cgi | 56 +++++++++++++++++++++++++++------------------- langs/de/cgi-bin/de.pl | 9 +++++++ langs/en/cgi-bin/en.pl | 9 +++++++ langs/es/cgi-bin/es.pl | 9 +++++++ langs/fr/cgi-bin/fr.pl | 11 ++++++++- 5 files changed, 70 insertions(+), 24 deletions(-) Difference in files: diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 3bb6afd..7cdad01 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -79,11 +79,11 @@ if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'}) @deviceline = split( /\;/, $deviceentry ); if ( "$extrahdsettings{'PATH'}" eq "$deviceline[2]" ) { $ok = "false"; - $errormessage = "You can't mount $extrahdsettings{'DEVICE'} to $extrahdsettings{'PATH'}, because there is already a device mounted."; + $errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd because there is already a device mounted'}."; } if ( "$extrahdsettings{'PATH'}" eq "/" ) { $ok = "false"; - $errormessage = "You can't mount $extrahdsettings{'DEVICE'} to root /."; + $errormessage = "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'DEVICE'} $Lang::tr{'extrahd to root'}."; } } @@ -113,7 +113,7 @@ elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'}) } close FILE; } else { - $errormessage = "Can't umount $extrahdsettings{'PATH'}. Maybe the device is in use?"; + $errormessage = "$Lang::tr{'extrahd cant umount'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd maybe the device is in use'}?"; } } @@ -143,10 +143,10 @@ END $color=$Header::colourgreen; } print <<END - <tr><td colspan="5">  - <tr><td align='center'><font color=$color><b>$deviceline[0]</b></font> - <td align='center'>$deviceline[1] - <td align='center'>$deviceline[2] + <tr><td colspan="4"> </td></tr> + <tr><td align='left'><font color=$color><b>$deviceline[0]</b></font></td> + <td align='left'>$deviceline[1]</td> + <td align='left'>$deviceline[2]</td> <td align='center'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='DEVICE' value='$deviceline[0]' /> @@ -154,7 +154,7 @@ END <input type='hidden' name='PATH' value='$deviceline[2]' /> <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} /> <input type='image' alt=$Lang::tr{'delete'} src='/images/delete.gif' /> - </form> + </form></td></tr> END ; } @@ -179,21 +179,26 @@ END foreach $scanentry (sort @scans) { @scanline = split( /\;/, $scanentry ); - print <<END - <tr><td colspan="5">  - <tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b> - <td align='center' colspan="2">$scanline[1] + # remove wrong entries like usb controller name + if ($scanline[1] ne "\n") + { + print <<END + <tr><td colspan="5"> </td></tr> + <tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b></td> + <td align='center' colspan="2">$scanline[1]</td> END ; + + } foreach $partitionentry (sort @partitions) { @partitionline = split( /\;/, $partitionentry ); if ( "$partitionline[0]" eq "$scanline[0]" ) { $size = int($partitionline[1] / 1024); print <<END - <td align='center'>$Lang::tr{'size'} $size MB - <td>  - <tr><td colspan="5">  + <td align='center'>$Lang::tr{'size'} $size MB</td> + <td> </td></tr> + <tr><td colspan="5"> </td></tr> END ; } @@ -202,28 +207,31 @@ END foreach $partitionentry (sort @partitions) { @partitionline = split( /\;/, $partitionentry ); - if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" eq "" )) { + if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && ! ( "$partitionline[0]" eq "$scanline[0]" )) { $size = int($partitionline[1] / 1024); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <tr><td align="left" colspan=5><b>UUID=$partitionline[2]</b></td></tr> + <tr><td align="left" colspan=5><strong>UUID=$partitionline[2]</strong></td></tr> <tr> <td align="list">/dev/$partitionline[0]</td> - <td align="center">$Lang::tr{'size'} $size MB + <td align="center">$Lang::tr{'size'} $size MB</td> <td align="center"><select name="FS"> <option value="auto">auto</option> <option value="ext3">ext3</option> + <option value="ext4">ext4</option> <option value="reiserfs">reiserfs</option> <option value="vfat">fat</option> <option value="ntfs-3g">ntfs (experimental)</option> - </select> - <td align="center"><input type='text' name='PATH' value=/mnt/harddisk /> + </select></td> + <td align="center"><input type='text' name='PATH' value=/mnt/harddisk /></td> <td align="center"> <input type='hidden' name='DEVICE' value='$partitionline[0]' /> <input type='hidden' name='UUID' value='$partitionline[2]' /> <input type='hidden' name='ACTION' value=$Lang::tr{'add'} /> <input type='image' alt=$Lang::tr{'add'} src='/images/add.gif' /> - </form> + </form></td></tr> +END +; END ; @@ -232,7 +240,9 @@ END } print <<END - <tr><td align="center" colspan="5">If your device isn't listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first. + <tr><td align="center" colspan="5"> </td></tr> + <tr><td align="center" colspan="5"> </td></tr> + <tr><td align="center" colspan="5">$Lang::tr{'extrahd install or load driver'}</td></tr> </table> END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b78efc5..81cc3ee 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -775,6 +775,15 @@ 'external aliases configuration' => 'Externe Alias-Konfiguration', 'extrahd' => 'ExtraHD', 'extrahd detected drives' => 'gefundene Laufwerke', +'extrahd unable to read' => 'Lesefehler von', +'extrahd unable to write' => 'Schreibfehler von', +'extrahd you cant mount' => 'Sie können', +'extrahd to' => 'nicht nach', +'extrahd to root' => 'nicht nach root mounten', +'extrahd because there is already a device mounted' => ' mounten, weil bereits ein Geräte gemountet ist', +'extrahd cant umount' => 'Konnte', +'extrahd maybe the device is in use' => 'nicht mounten. Vielleicht wird das Gerät bereits verwendet', +'extrahd install or load driver' => 'Wenn Ihre Festplatte nicht angezeigt wird, müssen Sie zuerst den Treiber laden oder ggf. auch nach installieren. Wenn diese jedoch angezeigt wird, aber keine Partitionen zu sehen sind, müssen diese erst angelegt werden.', 'false classnumber' => 'Die Klassennummer passt nicht zum angegebenen Interface.', 'false max bandwith' => 'Maximalbandbreite ist ungültig.', 'false min bandwith' => 'Mindestbandbreite ist ungültig.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 20a2681..ad48b4a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -799,6 +799,15 @@ 'external aliases configuration' => 'External aliases configuration', 'extrahd' => 'ExtraHD', 'extrahd detected drives' => 'detected drives', +'extrahd unable to read' => 'Unable to read', +'extrahd unable to write' => 'Unable to write', +'extrahd you cant mount' => 'You can\'t mount', +'extrahd to' => 'to', +'extrahd to root' => 'to root', +'extrahd because there is already a device mounted' => ', because there is already a device mounted', +'extrahd cant umount' => 'Can\'t umount', +'extrahd maybe the device is in use' => '. Maybe the device is in use', +'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.', 'false classnumber' => 'The Class-Number does not match the interface.', 'false max bandwith' => 'Maximum bandwith is false.', 'false min bandwith' => 'Minimum bandwith is false.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index e35c680..1b3c62f 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -797,6 +797,15 @@ 'external aliases configuration' => 'Configuración de Alias externo', 'extrahd' => 'Disco duro Adicional', 'extrahd detected drives' => 'Unidades encontradas', +'extrahd unable to read' => 'Unable to read', +'extrahd unable to write' => 'Unable to write', +'extrahd you cant mount' => 'You can\'t mount', +'extrahd to' => 'to', +'extrahd to root' => 'to root', +'extrahd because there is already a device mounted' => ', because there is already a device mounted', +'extrahd cant umount' => 'Can\'t umount', +'extrahd maybe the device is in use' => '. Maybe the device is in use', +'extrahd install or load driver' => 'If your device isn\'t listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first.', 'false classnumber' => 'El número de clase no coincide con la interfaz', 'false max bandwith' => 'El ancho de banda máximo es falso', 'false min bandwith' => 'El ancho de banda mínimo es falso', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 8d52e1d..c2ac5b4 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -797,7 +797,16 @@ 'external access rule removed' => 'Règle d\'accès externe supprimée; redémarrage du controleur d\'accès', 'external aliases configuration' => 'Configuration des alias externes', 'extrahd' => 'ExtraHD', -'extrahd founded drives' => 'Périphériques trouvés', +'extrahd detected drives' => 'Périphériques trouvés', +'extrahd unable to read' => 'Impossible de lire', +'extrahd unable to write' => 'Impossible d\'écrire', +'extrahd you cant mount' => 'Vous ne pouvez pas monter', +'extrahd to' => 'vers', +'extrahd to root' => 'vers root', +'extrahd because there is already a device mounted' => ' car vous avez déjà un support de monté', +'extrahd cant umount' => 'Impossible de démonter', +'extrahd maybe the device is in use' => '. Votre support est peut-être en cours d\'utilisation', +'extrahd install or load driver' => 'Si votre support n\'est pas visible ici, vous devez installer ou charger son pilote.<br />Si vous voyez votre support mais pas de partitions, vous devez tout d\'abord les créer.', 'false classnumber' => 'Le numéro de classe ne correspond pas à l\'interface.', 'false max bandwith' => 'La bande passante maximum est fausse.', 'false min bandwith' => 'La bande passante minimum est fausse.', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 63ca66d438520e9c613922e4f419ed50eaf1bc6c
by git＠ipfire.org 31 May '11

31 May '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 63ca66d438520e9c613922e4f419ed50eaf1bc6c (commit) from e32571f0316a01ea940145287a5588640e3a3c2c (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 63ca66d438520e9c613922e4f419ed50eaf1bc6c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 31 21:16:31 2011 +0200 kernel: disabled more wireles modules that will be replaced by compat-wireless. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 109 +++++--------------------- config/kernel/kernel.config.i586-ipfire-pae | 103 +++++-------------------- config/kernel/kernel.config.i586-ipfire-xen | 103 +++++-------------------- 3 files changed, 59 insertions(+), 256 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 43bba22..ae35efb 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.27-ipfire -# Thu Dec 30 13:29:23 2010 +# Linux kernel version: 2.6.32.41-ipfire +# Tue May 31 14:26:02 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -96,7 +96,6 @@ CONFIG_RCU_FANOUT=32 # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y @@ -277,9 +276,9 @@ CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set CONFIG_IOMMU_API=y CONFIG_NR_CPUS=8 -CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y +CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -1686,13 +1685,8 @@ CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set CONFIG_AIRO=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m @@ -1703,32 +1697,15 @@ CONFIG_PCMCIA_WL3501=m CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m +# CONFIG_RTL8180 is not set +# CONFIG_RTL8187 is not set +# CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_LEDS=y -CONFIG_ATH_COMMON=m -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -# CONFIG_IPW2100_MONITOR is not set -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -# CONFIG_IPW2200_MONITOR is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set +# CONFIG_MWL8K is not set +# CONFIG_P54_COMMON is not set +# CONFIG_ATH_COMMON is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set # CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -1736,56 +1713,13 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SDIO=m -CONFIG_IWM=m +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set +# CONFIG_HERMES is not set +# CONFIG_WL12XX is not set +# CONFIG_IWM is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -2490,10 +2424,9 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_SSB=m CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y CONFIG_SSB_PCIHOST_POSSIBLE=y CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y +# CONFIG_SSB_B43_PCI_BRIDGE is not set CONFIG_SSB_PCMCIAHOST_POSSIBLE=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST_POSSIBLE=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f37b655..7eeb130 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.40 -# Sat May 14 09:27:43 2011 +# Linux kernel version: 2.6.32.41-ipfire-pae +# Sat May 31 15:00:00 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1704,13 +1704,8 @@ CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set CONFIG_AIRO=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m @@ -1721,32 +1716,15 @@ CONFIG_PCMCIA_WL3501=m CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m +# CONFIG_RTL8180 is not set +# CONFIG_RTL8187 is not set +# CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_LEDS=y -CONFIG_ATH_COMMON=m -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -# CONFIG_IPW2100_MONITOR is not set -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -# CONFIG_IPW2200_MONITOR is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set +# CONFIG_MWL8K is not set +# CONFIG_P54_COMMON is not set +# CONFIG_ATH_COMMON is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set # CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -1754,56 +1732,13 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SDIO=m -CONFIG_IWM=m +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set +# CONFIG_HERMES is not set +# CONFIG_WL12XX is not set +# CONFIG_IWM is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index fa50c95..4051184 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.33 -# Mon Mar 21 14:20:43 2011 +# Linux kernel version: 2.6.32.41-ipfire-xen +# Mon May 31 15:00:00 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1482,13 +1482,8 @@ CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set CONFIG_AIRO=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m @@ -1499,32 +1494,15 @@ CONFIG_PCMCIA_WL3501=m CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m +# CONFIG_RTL8180 is not set +# CONFIG_RTL8187 is not set +# CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_LEDS=y -CONFIG_ATH_COMMON=m -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -# CONFIG_IPW2100_MONITOR is not set -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -# CONFIG_IPW2200_MONITOR is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set +# CONFIG_MWL8K is not set +# CONFIG_P54_COMMON is not set +# CONFIG_ATH_COMMON is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set # CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -1532,56 +1510,13 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_SDIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_HT=y -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_WL12XX=m -CONFIG_WL1251=m -CONFIG_WL1251_SDIO=m -CONFIG_IWM=m +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_ZD1211RW is not set +# CONFIG_RT2X00 is not set +# CONFIG_HERMES is not set +# CONFIG_WL12XX is not set +# CONFIG_IWM is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 50263b0b8312ec35fe6dcee5486fb6518907e005
by git＠ipfire.org 30 May '11

30 May '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 50263b0b8312ec35fe6dcee5486fb6518907e005 (commit) via 50958f154aa611f780c15c74459f45c5f546fc79 (commit) from 54eb4a97c57f73e5e0de3ec623ca4ace8413354e (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 50263b0b8312ec35fe6dcee5486fb6518907e005 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 30 16:30:59 2011 +0200 gnutls: Update to 2.12.5. Closes #201. commit 50958f154aa611f780c15c74459f45c5f546fc79 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 30 16:10:21 2011 +0200 ccache: Update to 3.1.5. Closes #200. ----------------------------------------------------------------------- Summary of changes: pkgs/ccache/ccache.nm | 6 +++--- pkgs/gnutls/gnutls.nm | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) Difference in files: diff --git a/pkgs/ccache/ccache.nm b/pkgs/ccache/ccache.nm index 0a22718..19e0460 100644 --- a/pkgs/ccache/ccache.nm +++ b/pkgs/ccache/ccache.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = ccache -PKG_VER = 3.1.4 -PKG_REL = 2 +PKG_VER = 3.1.5 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Development/Compilers @@ -45,7 +45,7 @@ define PKG_DESCRIPTION a 5 to 10 times speedup in common compilations. endef -PKG_TARBALL = $(THISAPP).tar.xz +PKG_TARBALL = $(THISAPP).tar.bz2 # Sets ccache max size up to 2 GB CFLAGS += -DDEFAULT_MAXSIZE=2097152 diff --git a/pkgs/gnutls/gnutls.nm b/pkgs/gnutls/gnutls.nm index cffa437..27727e9 100644 --- a/pkgs/gnutls/gnutls.nm +++ b/pkgs/gnutls/gnutls.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = gnutls -PKG_VER = 2.8.1 +PKG_VER = 2.12.5 PKG_REL = 1 PKG_MAINTAINER = @@ -49,4 +49,5 @@ PKG_PACKAGES += $(PKG_NAME)-devel CONFIGURE_OPTIONS += \ --with-included-libcfg \ - --disable-srp-authentication + --disable-srp-authentication \ + --with-libgcrypt hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e32571f0316a01ea940145287a5588640e3a3c2c
by git＠ipfire.org 30 May '11

30 May '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 e32571f0316a01ea940145287a5588640e3a3c2c (commit) via 9a5f5d39b669a02d80c4f034e24dac0aa7414f9a (commit) via f80f9d7e47f143f6d72e15ed2c3e0b8bc1ac7bc1 (commit) via dabe2eeb0deb3e28becf673ec13420b0e9574c22 (commit) from 162d2e2fc78b65b48fa84b7399a5a647b5c6534b (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 e32571f0316a01ea940145287a5588640e3a3c2c Merge: 162d2e2 9a5f5d3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 30 12:38:10 2011 +0200 Merge branch 'master' into next Conflicts: make.sh ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{49 => 50}/exclude | 0 config/rootfiles/core/50/filelists/files | 1 + config/rootfiles/core/{49 => 50}/filelists/icons | 0 config/rootfiles/core/{49 => 50}/meta | 0 config/rootfiles/{oldcore/48 => core/50}/update.sh | 2 +- make.sh | 4 ++-- 6 files changed, 4 insertions(+), 3 deletions(-) copy config/rootfiles/core/{49 => 50}/exclude (100%) create mode 100644 config/rootfiles/core/50/filelists/files rename config/rootfiles/core/{49 => 50}/filelists/icons (100%) copy config/rootfiles/core/{49 => 50}/meta (100%) copy config/rootfiles/{oldcore/48 => core/50}/update.sh (99%) Difference in files: diff --git a/config/rootfiles/core/49/filelists/icons b/config/rootfiles/core/49/filelists/icons deleted file mode 100644 index 52b22e0..0000000 --- a/config/rootfiles/core/49/filelists/icons +++ /dev/null @@ -1,13 +0,0 @@ -srv/web/ipfire/html/images/delete.gif -srv/web/ipfire/html/images/document-save.png -srv/web/ipfire/html/images/edit.gif -srv/web/ipfire/html/images/floppy.gif -srv/web/ipfire/html/images/forward.gif -srv/web/ipfire/html/images/info.gif -srv/web/ipfire/html/images/list-add.png -srv/web/ipfire/html/images/list-remove.png -srv/web/ipfire/html/images/package-x-generic.png -srv/web/ipfire/html/images/reload.gif -srv/web/ipfire/html/images/stock_ok.png -srv/web/ipfire/html/images/stock_stop.png -srv/web/ipfire/html/images/user-trash.png diff --git a/config/rootfiles/core/50/exclude b/config/rootfiles/core/50/exclude new file mode 100644 index 0000000..6fe46b4 --- /dev/null +++ b/config/rootfiles/core/50/exclude @@ -0,0 +1 @@ +/srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/50/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/50/filelists/icons b/config/rootfiles/core/50/filelists/icons new file mode 100644 index 0000000..52b22e0 --- /dev/null +++ b/config/rootfiles/core/50/filelists/icons @@ -0,0 +1,13 @@ +srv/web/ipfire/html/images/delete.gif +srv/web/ipfire/html/images/document-save.png +srv/web/ipfire/html/images/edit.gif +srv/web/ipfire/html/images/floppy.gif +srv/web/ipfire/html/images/forward.gif +srv/web/ipfire/html/images/info.gif +srv/web/ipfire/html/images/list-add.png +srv/web/ipfire/html/images/list-remove.png +srv/web/ipfire/html/images/package-x-generic.png +srv/web/ipfire/html/images/reload.gif +srv/web/ipfire/html/images/stock_ok.png +srv/web/ipfire/html/images/stock_stop.png +srv/web/ipfire/html/images/user-trash.png diff --git a/config/rootfiles/core/50/meta b/config/rootfiles/core/50/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/50/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/50/update.sh b/config/rootfiles/core/50/update.sh new file mode 100644 index 0000000..6c0c2ea --- /dev/null +++ b/config/rootfiles/core/50/update.sh @@ -0,0 +1,59 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=50 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 5f595e8..4a7e374 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.10" # Version number -CORE="49" # Core Level (Filename) -PAKFIRE_CORE="48" # Core Level (PAKFIRE) +CORE="50" # Core Level (Filename) +PAKFIRE_CORE="49" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9a5f5d39b669a02d80c4f034e24dac0aa7414f9a
by git＠ipfire.org 30 May '11

30 May '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 9a5f5d39b669a02d80c4f034e24dac0aa7414f9a (commit) from f80f9d7e47f143f6d72e15ed2c3e0b8bc1ac7bc1 (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 9a5f5d39b669a02d80c4f034e24dac0aa7414f9a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 30 12:35:44 2011 +0200 move icons update from core49 to 50. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{49 => 50}/filelists/icons | 0 1 files changed, 0 insertions(+), 0 deletions(-) rename config/rootfiles/core/{49 => 50}/filelists/icons (100%) Difference in files: diff --git a/config/rootfiles/core/49/filelists/icons b/config/rootfiles/core/49/filelists/icons deleted file mode 100644 index 52b22e0..0000000 --- a/config/rootfiles/core/49/filelists/icons +++ /dev/null @@ -1,13 +0,0 @@ -srv/web/ipfire/html/images/delete.gif -srv/web/ipfire/html/images/document-save.png -srv/web/ipfire/html/images/edit.gif -srv/web/ipfire/html/images/floppy.gif -srv/web/ipfire/html/images/forward.gif -srv/web/ipfire/html/images/info.gif -srv/web/ipfire/html/images/list-add.png -srv/web/ipfire/html/images/list-remove.png -srv/web/ipfire/html/images/package-x-generic.png -srv/web/ipfire/html/images/reload.gif -srv/web/ipfire/html/images/stock_ok.png -srv/web/ipfire/html/images/stock_stop.png -srv/web/ipfire/html/images/user-trash.png diff --git a/config/rootfiles/core/50/filelists/icons b/config/rootfiles/core/50/filelists/icons new file mode 100644 index 0000000..52b22e0 --- /dev/null +++ b/config/rootfiles/core/50/filelists/icons @@ -0,0 +1,13 @@ +srv/web/ipfire/html/images/delete.gif +srv/web/ipfire/html/images/document-save.png +srv/web/ipfire/html/images/edit.gif +srv/web/ipfire/html/images/floppy.gif +srv/web/ipfire/html/images/forward.gif +srv/web/ipfire/html/images/info.gif +srv/web/ipfire/html/images/list-add.png +srv/web/ipfire/html/images/list-remove.png +srv/web/ipfire/html/images/package-x-generic.png +srv/web/ipfire/html/images/reload.gif +srv/web/ipfire/html/images/stock_ok.png +srv/web/ipfire/html/images/stock_stop.png +srv/web/ipfire/html/images/user-trash.png hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f80f9d7e47f143f6d72e15ed2c3e0b8bc1ac7bc1
by git＠ipfire.org 30 May '11

30 May '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 f80f9d7e47f143f6d72e15ed2c3e0b8bc1ac7bc1 (commit) from dabe2eeb0deb3e28becf673ec13420b0e9574c22 (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 f80f9d7e47f143f6d72e15ed2c3e0b8bc1ac7bc1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 30 12:33:39 2011 +0200 start core50. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{48 => 50}/exclude | 0 config/rootfiles/core/50/filelists/files | 1 + config/rootfiles/core/{44 => 50}/meta | 0 config/rootfiles/core/{48 => 50}/update.sh | 2 +- make.sh | 2 +- 5 files changed, 3 insertions(+), 2 deletions(-) copy config/rootfiles/core/{48 => 50}/exclude (100%) create mode 100644 config/rootfiles/core/50/filelists/files copy config/rootfiles/core/{44 => 50}/meta (100%) copy config/rootfiles/core/{48 => 50}/update.sh (99%) Difference in files: diff --git a/config/rootfiles/core/50/exclude b/config/rootfiles/core/50/exclude new file mode 100644 index 0000000..6fe46b4 --- /dev/null +++ b/config/rootfiles/core/50/exclude @@ -0,0 +1 @@ +/srv/web/ipfire/html/proxy.pac diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/50/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/50/meta b/config/rootfiles/core/50/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/50/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/50/update.sh b/config/rootfiles/core/50/update.sh new file mode 100644 index 0000000..6c0c2ea --- /dev/null +++ b/config/rootfiles/core/50/update.sh @@ -0,0 +1,59 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=50 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 7d896d3..54f3aec 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="49" # Core Level (Filename) +CORE="50" # Core Level (Filename) PAKFIRE_CORE="49" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. dabe2eeb0deb3e28becf673ec13420b0e9574c22
by git＠ipfire.org 30 May '11

30 May '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 dabe2eeb0deb3e28becf673ec13420b0e9574c22 (commit) from 94a4640d3a41b9aba5b1e998d78db63f32c70df1 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index d53d0ec..7d896d3 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number CORE="49" # Core Level (Filename) -PAKFIRE_CORE="48" # Core Level (PAKFIRE) +PAKFIRE_CORE="49" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-core49, created. dabe2eeb0deb3e28becf673ec13420b0e9574c22
by git＠ipfire.org 30 May '11

30 May '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 tag, v2.9-core49 has been created at dabe2eeb0deb3e28becf673ec13420b0e9574c22 (commit) - Log ----------------------------------------------------------------- commit dabe2eeb0deb3e28becf673ec13420b0e9574c22 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 28 11:52:50 2011 +0200 finish core49. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 54eb4a97c57f73e5e0de3ec623ca4ace8413354e
by git＠ipfire.org 28 May '11

28 May '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 54eb4a97c57f73e5e0de3ec623ca4ace8413354e (commit) via fdd45d973090cc72efd6db1cad8143e775d4079f (commit) from e0bee503456c9d1f0c5c9606635a95e1d220310e (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 54eb4a97c57f73e5e0de3ec623ca4ace8413354e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun May 29 01:20:25 2011 +0200 man-db: Package should also be known as "man". commit fdd45d973090cc72efd6db1cad8143e775d4079f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun May 29 01:19:37 2011 +0200 initscripts: Add ipcalc binary. ----------------------------------------------------------------------- Summary of changes: pkgs/initscripts/initscripts.nm | 8 +- pkgs/initscripts/src/Makefile | 18 ++- pkgs/initscripts/src/ipcalc-tests | 98 ++++++++ pkgs/initscripts/src/ipcalc.1 | 73 ++++++ pkgs/initscripts/src/ipcalc.c | 476 +++++++++++++++++++++++++++++++++++++ pkgs/man-db/man-db.nm | 5 +- 6 files changed, 672 insertions(+), 6 deletions(-) create mode 100755 pkgs/initscripts/src/ipcalc-tests create mode 100644 pkgs/initscripts/src/ipcalc.1 create mode 100644 pkgs/initscripts/src/ipcalc.c Difference in files: diff --git a/pkgs/initscripts/initscripts.nm b/pkgs/initscripts/initscripts.nm index de10dec..6fef205 100644 --- a/pkgs/initscripts/initscripts.nm +++ b/pkgs/initscripts/initscripts.nm @@ -27,7 +27,7 @@ include $(PKGROOT)/Include PKG_NAME = initscripts PKG_EPOCH = 1 PKG_VER = 2.99 -PKG_REL = 3 +PKG_REL = 4 PKG_MAINTAINER = PKG_GROUPS = Base System/Boot @@ -35,7 +35,7 @@ PKG_URL = PKG_LICENSE = GPLv3+ PKG_SUMMARY = The set of scripts that initalize the system. -PKG_BUILD_DEPS+= glib2-devel +PKG_BUILD_DEPS+= glib2-devel popt-devel PKG_DEPS += bash coreutils e2fsprogs grep iproute2 module-init-tools \ procps sed system-release udev util-linux @@ -54,6 +54,10 @@ define STAGE_BUILD cd $(DIR_APP)/src && make $(PARALLELISMFLAGS) endef +define STAGE_TEST + cd $(DIR_APP)/src && make test +endef + define STAGE_INSTALL cd $(DIR_APP)/src && make install clean DESTDIR=$(BUILDROOT) diff --git a/pkgs/initscripts/src/Makefile b/pkgs/initscripts/src/Makefile index a93390d..bb486fa 100644 --- a/pkgs/initscripts/src/Makefile +++ b/pkgs/initscripts/src/Makefile @@ -1,5 +1,5 @@ -PROGS = console_check console_init securetty +PROGS = console_check console_init ipcalc securetty CC = gcc CFLAGS += -D_GNU_SOURCE $(shell pkg-config --cflags glib-2.0) @@ -9,17 +9,29 @@ all: $(PROGS) clean: rm -vf $(PROGS) *.o -install: - -mkdir -pv $(DESTDIR)/lib/udev $(DESTDIR)/sbin +test: ipcalc + ./ipcalc-tests + +install: $(PROGS) + # Install binaries + -mkdir -pv $(DESTDIR)/lib/udev $(DESTDIR)/{,s}bin install -v -m 755 console_check $(DESTDIR)/lib/udev/ install -v -m 755 console_init $(DESTDIR)/lib/udev/ + install -v -m 755 ipcalc $(DESTDIR)/bin install -v -m 755 securetty $(DESTDIR)/sbin + # Install man pages + -mkdir -pv $(DESTDIR)/usr/share/man/man1 + install -v -m 644 ipcalc.1 $(DESTDIR)/usr/share/man/man1 + console_check: console_check.o $(CC) $(LDFLAGS) -o $@ $< console_init: console_init.o shvar.o $(CC) $(LDFLAGS) $(shell pkg-config --libs glib-2.0) -o $@ $? +ipcalc: ipcalc.o + $(CC) $(LDFLAGS) -o $@ $< -lpopt + securetty: securetty.o $(CC) $(LDFLAGS) -o $@ $< diff --git a/pkgs/initscripts/src/ipcalc-tests b/pkgs/initscripts/src/ipcalc-tests new file mode 100755 index 0000000..ebb777d --- /dev/null +++ b/pkgs/initscripts/src/ipcalc-tests @@ -0,0 +1,98 @@ +#!/bin/bash +# +# Run some simple ipcalc tests. +# +# Adapted from: Matej Susta <msusta(a)redhat.com> +# +# Copyright (c) 2009 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# 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, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + +bin=./ipcalc +exitcode=0 + +ok() { + echo "ok." +} + +fail() { + echo "FAILED!" + exitcode=$((exitcode+1)) + echo -e "Output was:\n$output" +} + +TestSuccess() { + echo -n "Checking $@... " + output=$(sh -c "$1" 2>&1) + rc=$? + [ $rc -eq 0 ] && ok || fail $output +} + +TestFailure() { + echo -n "Checking $@... " + output=$(sh -c "$1" 2>&1) + rc=$? + [ $rc -eq 0 ] && fail $output || ok +} + +TestOutput() { + echo -n "Checking $1... " + output=$(sh -c "$1" 2>&1) + rc=$? + [ "$output" = "$2" ] && ok || fail $output +} + +echo -n "Checking for ipcalc binary... " +[ -x $bin ] || { fail ; exit $exitcode ; } + +TestSuccess "$bin --help" + +TestSuccess "$bin -c 127.0.0.1" +TestSuccess "$bin -c -6 ::1" +TestSuccess "$bin -c ::1" + +TestSuccess "$bin -c 192.168.1.1" +TestSuccess "$bin -c -6 2a01:198:200:300::2" +TestSuccess "$bin -c -6 2a01:198:200:300:0000:0000:0000:2" +TestSuccess "$bin -c -6 2a01:0198:0200:0300:0000:0000:0000:0002" +TestSuccess "$bin -c -6 ::1/128" +TestSuccess "$bin -c -6 fec0::1:0:0:c0a8:8002/64" + +TestFailure "$bin -c -6 gggg::" +TestFailure "$bin -b -6 ::1/128" +TestFailure "$bin -c -4 -6 2a01:198:200:300:0000:0000:0000:2" +TestFailure "$bin -c -4 -6 127.0.0.1" +TestFailure "$bin -c -6 127.0.0.1" +TestFailure "$bin -c ::1/999" +TestFailure "$bin -m 192.168.1.1/-1" +TestFailure "$bin -m 192.168.1.1/64" +TestFailure "$bin -m 192.168.1.1/99999" + +TestOutput "$bin -b 192.168.1.1/24" "BROADCAST=192.168.1.255" +TestOutput "$bin -b 192.168.1.1 255.255.255.0" "BROADCAST=192.168.1.255" +TestOutput "$bin -m 192.168.1.1/24" "NETMASK=255.255.255.0" +TestOutput "$bin -p 192.168.1.1 255.255.255.0" "PREFIX=24" +TestOutput "$bin -p 192.168.1.1 255.255.255.255" "PREFIX=32" +TestOutput "$bin -p 192.168.1.1 0.0.0.0" "PREFIX=0" +TestOutput "$bin -p 172.16.59.222 255.255.252.0" "PREFIX=22" +TestOutput "$bin -m 172.16.59.222/22" "NETMASK=255.255.252.0" +TestOutput "$bin -m 192.168.1.1" "NETMASK=255.255.255.0" +TestOutput "$bin -m 10.1.2.3" "NETMASK=255.0.0.0" +TestOutput "$bin -m 129.22.4.3" "NETMASK=255.255.0.0" +TestOutput "$bin -n 192.168.1.1/32" "NETWORK=192.168.1.1" +TestOutput "$bin -n 192.168.1.1/0" "NETWORK=0.0.0.0" + +echo "$exitcode test(s) failed." +exit $exitcode diff --git a/pkgs/initscripts/src/ipcalc.1 b/pkgs/initscripts/src/ipcalc.1 new file mode 100644 index 0000000..30e0b20 --- /dev/null +++ b/pkgs/initscripts/src/ipcalc.1 @@ -0,0 +1,73 @@ +.TH IPCALC 1 "April 30 2001" "Red Hat, Inc." \" -*- nroff -*- +.SH NAME +ipcalc \- perform simple manipulation of IP addresses +.SH SYNOPSIS +.B ipcalc +[\fIOPTION\fR]... <\fBIP address\fR>[\fI/prefix\fR] [\fInetmask\fR] + +.SH DESCRIPTION +\fBipcalc\fR provides a simple way to calculate IP information for a host. +The various options specify what information \fBipcalc\fR should display +on standard out. Multiple options may be specified. An IP address to +operate on must always be specified. Most operations also require a +netmask or a CIDR prefix as well. + +.SH OPTIONS +.TP +.TP +\fB\-c\fR, \fB\-\-check\fR +Validate the IP address under the specified family. If no address +family is specified, IPv4 is assumed. + +.TP +\fB\-4\fR, \fB\-\-ipv4\fR +Specify IPv4 address family (default). + +.TP +\fB\-6\fR, \fB\-\-ipv6\fR +Specify IPv6 address family. + +.TP +\fB\-b\fR, \fB\-\-broadcast\fR +Display the broadcast address for the given IP address and netmask. + +.TP +\fB\-h\fR, \fB\-\-hostname\fR +Display the hostname for the given IP address. + +.TP +\fB\-m\fR, \fB\-\-netmask\fR +Calculate the netmask for the given IP address. It assumes that the IP +address is in a complete class A, B, or C network. Many networks do +not use the default netmasks, in which case an inappropriate value will +be returned. + +.TP +\fB\-p\fR, \fB\-\-prefix\fR +Show the prefix for the given mask/IP address. + +.TP +\fB\-n\fR, \fB\-\-network\fR +Display the network address for the given IP address and netmask. + +.TP +\fB\-s\fR, \fB\-\-silent\fR +Don't ever display error messages. + +.SH AUTHORS +.nf +Erik Troan <ewt(a)redhat.com> +.nf +Preston Brown <pbrown(a)redhat.com> + +.TP +IPv6 supported wedged in by David Cantrell <dcantrell(a)redhat.com> +.fi +.SH "REPORTING BUGS" +Report bugs at http://bugzilla.redhat.com/ +.SH COPYRIGHT +Copyright \(co 1997-2008 Red Hat, Inc. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. diff --git a/pkgs/initscripts/src/ipcalc.c b/pkgs/initscripts/src/ipcalc.c new file mode 100644 index 0000000..8deccca --- /dev/null +++ b/pkgs/initscripts/src/ipcalc.c @@ -0,0 +1,476 @@ +/* + * Copyright (c) 1997-2009 Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, + * as published by the Free Software Foundation. + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Authors: + * Erik Troan <ewt(a)redhat.com> + * Preston Brown <pbrown(a)redhat.com> + * David Cantrell <dcantrell(a)redhat.com> + */ + +#include <ctype.h> +#include <popt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/socket.h> +#include <sys/types.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#include <netdb.h> + +/*! + \file ipcalc.c + \brief provides utilities for manipulating IP addresses. + + ipcalc provides utilities and a front-end command line interface for + manipulating IP addresses, and calculating various aspects of an ip + address/netmask/network address/prefix/etc. + + Functionality can be accessed from other languages from the library + interface, documented here. To use ipcalc from the shell, read the + ipcalc(1) manual page. + + When passing parameters to the various functions, take note of whether they + take host byte order or network byte order. Most take host byte order, and + return host byte order, but there are some exceptions. +*/ + +/*! + \fn struct in_addr prefix2mask(int bits) + \brief creates a netmask from a specified number of bits + + This function converts a prefix length to a netmask. As CIDR (classless + internet domain internet domain routing) has taken off, more an more IP + addresses are being specified in the format address/prefix + (i.e. 192.168.2.3/24, with a corresponding netmask 255.255.255.0). If you + need to see what netmask corresponds to the prefix part of the address, this + is the function. See also \ref mask2prefix. + + \param prefix is the number of bits to create a mask for. + \return a network mask, in network byte order. +*/ +struct in_addr prefix2mask(int prefix) { + struct in_addr mask; + memset(&mask, 0, sizeof(mask)); + if (prefix) { + mask.s_addr = htonl(~((1 << (32 - prefix)) - 1)); + } else { + mask.s_addr = htonl(0); + } + return mask; +} + +/*! + \fn int mask2prefix(struct in_addr mask) + \brief calculates the number of bits masked off by a netmask. + + This function calculates the significant bits in an IP address as specified by + a netmask. See also \ref prefix2mask. + + \param mask is the netmask, specified as an struct in_addr in network byte order. + \return the number of significant bits. */ +int mask2prefix(struct in_addr mask) +{ + int count; + uint32_t saddr = ntohl(mask.s_addr); + + for (count=0; saddr > 0; count++) { + saddr=saddr << 1; + } + + return count; +} + +/*! + \fn struct in_addr default_netmask(struct in_addr addr) + + \brief returns the default (canonical) netmask associated with specified IP + address. + + When the Internet was originally set up, various ranges of IP addresses were + segmented into three network classes: A, B, and C. This function will return + a netmask that is associated with the IP address specified defining where it + falls in the predefined classes. + + \param addr an IP address in network byte order. + \return a netmask in network byte order. */ +struct in_addr default_netmask(struct in_addr addr) +{ + uint32_t saddr = addr.s_addr; + struct in_addr mask; + + memset(&mask, 0, sizeof(mask)); + + if (((ntohl(saddr) & 0xFF000000) >> 24) <= 127) + mask.s_addr = htonl(0xFF000000); + else if (((ntohl(saddr) & 0xFF000000) >> 24) <= 191) + mask.s_addr = htonl(0xFFFF0000); + else + mask.s_addr = htonl(0xFFFFFF00); + + return mask; +} + +/*! + \fn struct in_addr calc_broadcast(struct in_addr addr, int prefix) + + \brief calculate broadcast address given an IP address and a prefix length. + + \param addr an IP address in network byte order. + \param prefix a prefix length. + + \return the calculated broadcast address for the network, in network byte + order. +*/ +struct in_addr calc_broadcast(struct in_addr addr, int prefix) +{ + struct in_addr mask = prefix2mask(prefix); + struct in_addr broadcast; + + memset(&broadcast, 0, sizeof(broadcast)); + broadcast.s_addr = (addr.s_addr & mask.s_addr) | ~mask.s_addr; + return broadcast; +} + +/*! + \fn struct in_addr calc_network(struct in_addr addr, int prefix) + \brief calculates the network address for a specified address and prefix. + + \param addr an IP address, in network byte order + \param prefix the network prefix + \return the base address of the network that addr is associated with, in + network byte order. +*/ +struct in_addr calc_network(struct in_addr addr, int prefix) +{ + struct in_addr mask = prefix2mask(prefix); + struct in_addr network; + + memset(&network, 0, sizeof(network)); + network.s_addr = addr.s_addr & mask.s_addr; + return network; +} + +/*! + \fn const char *get_hostname(int family, void *addr) + \brief returns the hostname associated with the specified IP address + + \param family the address family, either AF_INET or AF_INET6. + \param addr an IP address to find a hostname for, in network byte order, + should either be a pointer to a struct in_addr or a struct in6_addr. + + \return a hostname, or NULL if one cannot be determined. Hostname is stored + in a static buffer that may disappear at any time, the caller should copy the + data if it needs permanent storage. +*/ +char *get_hostname(int family, void *addr) +{ + struct hostent * hostinfo = NULL; + int x; + struct in_addr addr4; + struct in6_addr addr6; + + if (family == AF_INET) { + memset(&addr4, 0, sizeof(addr4)); + memcpy(&addr4, addr, sizeof(addr4)); + hostinfo = gethostbyaddr((const void *) &addr4, + sizeof(addr4), family); + } else if (family == AF_INET6) { + memset(&addr6, 0, sizeof(addr6)); + memcpy(&addr6, addr, sizeof(addr6)); + hostinfo = gethostbyaddr((const void *) &addr6, + sizeof(addr6), family); + } + + if (!hostinfo) + return NULL; + + for (x=0; hostinfo->h_name[x]; x++) { + hostinfo->h_name[x] = tolower(hostinfo->h_name[x]); + } + return hostinfo->h_name; +} + +/*! + \fn main(int argc, const char **argv) + \brief wrapper program for ipcalc functions. + + This is a wrapper program for the functions that the ipcalc library provides. + It can be used from shell scripts or directly from the command line. + + For more information, please see the ipcalc(1) man page. +*/ +int main(int argc, const char **argv) { + int showBroadcast = 0, showPrefix = 0, showNetwork = 0; + int showHostname = 0, showNetmask = 0; + int beSilent = 0; + int doCheck = 0, familyIPv4 = 0, familyIPv6 = 0; + int rc; + poptContext optCon; + char *ipStr, *prefixStr, *netmaskStr, *chptr; + char *hostName = NULL; + char namebuf[INET6_ADDRSTRLEN+1]; + struct in_addr ip, netmask, network, broadcast; + struct in6_addr ip6; + int prefix = -1; + char errBuf[250]; + struct poptOption optionsTable[] = { + { "check", 'c', 0, &doCheck, 0, + "Validate IP address for specified address family", }, + { "ipv4", '4', 0, &familyIPv4, 0, + "IPv4 address family (default)", }, + { "ipv6", '6', 0, &familyIPv6, 0, + "IPv6 address family", }, + { "broadcast", 'b', 0, &showBroadcast, 0, + "Display calculated broadcast address", }, + { "hostname", 'h', 0, &showHostname, 0, + "Show hostname determined via DNS" }, + { "netmask", 'm', 0, &showNetmask, 0, + "Display default netmask for IP (class A, B, or C)" }, + { "network", 'n', 0, &showNetwork, 0, + "Display network address", }, + { "prefix", 'p', 0, &showPrefix, 0, + "Display network prefix", }, + { "silent", 's', 0, &beSilent, 0, + "Don't ever display error messages" }, + POPT_AUTOHELP + { NULL, '\0', 0, 0, 0, NULL, NULL } + }; + + optCon = poptGetContext("ipcalc", argc, argv, optionsTable, 0); + poptReadDefaultConfig(optCon, 1); + + if ((rc = poptGetNextOpt(optCon)) < -1) { + if (!beSilent) { + fprintf(stderr, "ipcalc: bad argument %s: %s\n", + poptBadOption(optCon, POPT_BADOPTION_NOALIAS), + poptStrerror(rc)); + poptPrintHelp(optCon, stderr, 0); + } + return 1; + } + + if (!(ipStr = (char *) poptGetArg(optCon))) { + if (!beSilent) { + fprintf(stderr, "ipcalc: ip address expected\n"); + poptPrintHelp(optCon, stderr, 0); + } + return 1; + } + + /* if there is a : in the address, it is an IPv6 address */ + if (strchr(ipStr,':') != NULL) { + familyIPv6=1; + } + + if (strchr(ipStr,'/') != NULL) { + prefixStr = strchr(ipStr, '/') + 1; + prefixStr--; + *prefixStr = '\0'; /* fix up ipStr */ + prefixStr++; + } else { + prefixStr = NULL; + } + + if (prefixStr != NULL) { + prefix = atoi(prefixStr); + if (prefix < 0 || ((familyIPv6 && prefix > 128) || (!familyIPv6 && prefix > 32))) { + if (!beSilent) + fprintf(stderr, "ipcalc: bad prefix: %s\n", prefixStr); + return 1; + } + } + + if (showBroadcast || showNetwork || showPrefix) { + if (!(netmaskStr = (char *) poptGetArg(optCon)) && (prefix < 0)) { + if (!beSilent) { + fprintf(stderr, "ipcalc: netmask or prefix expected\n"); + poptPrintHelp(optCon, stderr, 0); + } + return 1; + } else if (netmaskStr && prefix >= 0) { + if (!beSilent) { + fprintf(stderr, "ipcalc: both netmask and prefix specified\n"); + poptPrintHelp(optCon, stderr, 0); + } + return 1; + } else if (netmaskStr) { + if (inet_pton(AF_INET, netmaskStr, &netmask) <= 0) { + if (!beSilent) + fprintf(stderr, "ipcalc: bad netmask: %s\n", netmaskStr); + return 1; + } + prefix = mask2prefix(netmask); + } + } + + if ((chptr = (char *) poptGetArg(optCon))) { + if (!beSilent) { + fprintf(stderr, "ipcalc: unexpected argument: %s\n", chptr); + poptPrintHelp(optCon, stderr, 0); + } + return 1; + } + + if (!familyIPv4 && !familyIPv6) + familyIPv4 = 1; + + if (familyIPv4 && familyIPv6) { + if (!beSilent) { + fprintf(stderr, "ipcalc: cannot specify both address families\n"); + } + return 1; + } + + /* Handle CIDR entries such as 172/8 */ + if (prefix >= 0 && familyIPv4) { + char *tmp = ipStr; + int i; + + for (i=3; i> 0; i--) { + tmp = strchr(tmp,'.'); + if (!tmp) + break; + else + tmp++; + } + + tmp = NULL; + for (; i>0; i--) { + if (asprintf(&tmp, "%s.0", ipStr) == -1) { + fprintf(stderr, "Memory allocation failure line %d\n", __LINE__); + abort(); + } + ipStr = tmp; + } + } + + if (familyIPv4) { + if (inet_pton(AF_INET, ipStr, &ip) <= 0) { + if (!beSilent) + fprintf(stderr, "ipcalc: bad IPv4 address: %s\n", ipStr); + return 1; + } else if (prefix > 32) { + if (!beSilent) + fprintf(stderr, "ipcalc: bad IPv4 prefix %d\n", prefix); + return 1; + } else { + if (doCheck) + return 0; + } + } + + if (familyIPv6) { + if (inet_pton(AF_INET6, ipStr, &ip6) <= 0) { + if (!beSilent) + fprintf(stderr, "ipcalc: bad IPv6 address: %s\n", ipStr); + return 1; + } else if (prefix > 128) { + if (!beSilent) + fprintf(stderr, "ipcalc: bad IPv6 prefix %d\n", prefix); + return 1; + } else { + if (doCheck) + return 0; + } + } + + if (familyIPv6 && + (showBroadcast || showNetmask || showNetwork || showPrefix)) { + if (!beSilent) { + fprintf(stderr, "ipcalc: unable to show setting for IPv6\n"); + } + return 1; + } + + if (familyIPv4 && + !(showNetmask|showPrefix|showBroadcast|showNetwork|showHostname)) { + poptPrintHelp(optCon, stderr, 0); + return 1; + } + + poptFreeContext(optCon); + + /* we know what we want to display now, so display it. */ + + if (showNetmask) { + if (prefix >= 0) { + netmask = prefix2mask(prefix); + } else { + netmask = default_netmask(ip); + prefix = mask2prefix(netmask); + } + + memset(&namebuf, '\0', sizeof(namebuf)); + + if (inet_ntop(AF_INET, &netmask, namebuf, INET_ADDRSTRLEN) == NULL) { + fprintf(stderr, "Memory allocation failure line %d\n", __LINE__); + abort(); + } + + printf("NETMASK=%s\n", namebuf); + } + + if (showPrefix) { + if (prefix == -1) + prefix = mask2prefix(ip); + printf("PREFIX=%d\n", prefix); + } + + if (showBroadcast) { + broadcast = calc_broadcast(ip, prefix); + memset(&namebuf, '\0', sizeof(namebuf)); + + if (inet_ntop(AF_INET, &broadcast, namebuf, INET_ADDRSTRLEN) == NULL) { + fprintf(stderr, "Memory allocation failure line %d\n", __LINE__); + abort(); + } + + printf("BROADCAST=%s\n", namebuf); + } + + if (showNetwork) { + network = calc_network(ip, prefix); + memset(&namebuf, '\0', sizeof(namebuf)); + + if (inet_ntop(AF_INET, &network, namebuf, INET_ADDRSTRLEN) == NULL) { + fprintf(stderr, "Memory allocation failure line %d\n", __LINE__); + abort(); + } + + printf("NETWORK=%s\n", namebuf); + } + + if (showHostname) { + if (familyIPv4) { + hostName = get_hostname(AF_INET, &ip); + } else if (familyIPv6) { + hostName = get_hostname(AF_INET6, &ip6); + } + + if (hostName == NULL) { + if (!beSilent) { + sprintf(errBuf, "ipcalc: cannot find hostname for %s", ipStr); + herror(errBuf); + } + return 1; + } + + printf("HOSTNAME=%s\n", hostName); + } + + return 0; +} diff --git a/pkgs/man-db/man-db.nm b/pkgs/man-db/man-db.nm index 1c869d8..3f0ee45 100644 --- a/pkgs/man-db/man-db.nm +++ b/pkgs/man-db/man-db.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = man-db PKG_VER = 2.6.0.2 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUPS = Base Documentation @@ -37,6 +37,9 @@ PKG_SUMMARY = man-db is an on-line manual database. PKG_BUILD_DEPS+= db4-devel gdbm-devel groff less libpipeline-devel PKG_DEPS += groff less +# This package should also be known by "man". +PKG_PROVIDES += man + define PKG_DESCRIPTION man-db is an implementation of the standard Unix documentation \ system accessed using the man command. It uses a Berkeley DB database \ 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 May 2011