IPFire-SCM February 2012

ipfire-scm@lists.ipfire.org

1 participants
48 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2b9f83f070381e630da613ae9ba85e7e0f1905d4
by git＠ipfire.org 29 Feb '12

29 Feb '12

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 2b9f83f070381e630da613ae9ba85e7e0f1905d4 (commit) from 831339b09c4c2f0cf6d0b76f8d33b07ddef2cf32 (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 2b9f83f070381e630da613ae9ba85e7e0f1905d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 29 14:04:56 2012 +0100 pakfire: Add patches from upstream. ----------------------------------------------------------------------- Summary of changes: pakfire/pakfire.nm | 2 +- ...ange-default-hub-to-pakfirehub.ipfire.org.patch | 91 ++++++++++++++++++++ ...positories-only-when-are-actually-enabled.patch | 63 ++++++++++++++ 3 files changed, 155 insertions(+), 1 deletions(-) create mode 100644 pakfire/patches/pakfire-0.9.20-change-default-hub-to-pakfirehub.ipfire.org.patch create mode 100644 pakfire/patches/pakfire-0.9.20-update-repositories-only-when-are-actually-enabled.patch Difference in files: diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 1873907..8490682 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -5,7 +5,7 @@ name = pakfire version = 0.9.20 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Packaging diff --git a/pakfire/patches/pakfire-0.9.20-change-default-hub-to-pakfirehub.ipfire.org.patch b/pakfire/patches/pakfire-0.9.20-change-default-hub-to-pakfirehub.ipfire.org.patch new file mode 100644 index 0000000..dce9bfd --- /dev/null +++ b/pakfire/patches/pakfire-0.9.20-change-default-hub-to-pakfirehub.ipfire.org.patch @@ -0,0 +1,91 @@ +From 0f8823593c2c815b3dc2c7c9cb74b4d7a6b218de Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 29 Feb 2012 12:29:07 +0100 +Subject: [PATCH] Change default hub to pakfirehub.ipfire.org. + +--- + examples/client.conf | 2 +- + examples/daemon.conf | 2 +- + python/pakfire/client/base.py | 2 +- + python/pakfire/config.py | 4 ++-- + python/pakfire/constants.py | 3 +++ + 5 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/examples/client.conf b/examples/client.conf +index da57d03..6c59de9 100644 +--- a/examples/client.conf ++++ b/examples/client.conf +@@ -3,7 +3,7 @@ + [client] + + # The URL of the server to connect to. +-# server = https://pakfire.ipfire.org/ ++# server = https://pakfirehub.ipfire.org/ + + # Your credentials to log in on the hub. + # username = ipfire +diff --git a/examples/daemon.conf b/examples/daemon.conf +index 525cc1f..143a7f6 100644 +--- a/examples/daemon.conf ++++ b/examples/daemon.conf +@@ -3,7 +3,7 @@ + [daemon] + + # The URL of the server to connect to. +-# server = https://pakfire.ipfire.org/ ++# server = https://pakfirehub.ipfire.org/ + + # The hostname of this machine. + # hostname = <automatically detected> +diff --git a/python/pakfire/client/base.py b/python/pakfire/client/base.py +index 1886e2b..3ac4bef 100644 +--- a/python/pakfire/client/base.py ++++ b/python/pakfire/client/base.py +@@ -51,7 +51,7 @@ class PakfireClient(object): + ret += "%s:%s@" % (username, password) + + # Add host and path components. +- ret += "%s/pakfirehub/%s" % (url.netloc, self.type) ++ ret += "/".join((url.netloc, self.type)) + + return ret + +diff --git a/python/pakfire/config.py b/python/pakfire/config.py +index c7ab143..0d32784 100644 +--- a/python/pakfire/config.py ++++ b/python/pakfire/config.py +@@ -237,7 +237,7 @@ class ConfigClient(_Config): + "client" : { + # The default server is the official Pakfire + # server. +- "server" : "https://pakfire.ipfire.org", ++ "server" : PAKFIRE_HUB, + }, + } + +@@ -249,7 +249,7 @@ class ConfigDaemon(_Config): + "daemon" : { + # The default server is the official Pakfire + # server. +- "server" : "https://pakfire.ipfire.org", ++ "server" : PAKFIRE_HUB, + + # The default hostname is the host name of this + # machine. +diff --git a/python/pakfire/constants.py b/python/pakfire/constants.py +index 2998ab7..2c091e4 100644 +--- a/python/pakfire/constants.py ++++ b/python/pakfire/constants.py +@@ -27,6 +27,9 @@ from __version__ import PAKFIRE_VERSION + + PAKFIRE_LEAST_COMPATIBLE_VERSION = PAKFIRE_VERSION + ++# The default hub to connect to. ++PAKFIRE_HUB = "https://pakfirehub.ipfire.org/" ++ + SYSCONFDIR = "/etc" + SCRIPT_DIR = "/usr/lib/pakfire" + +-- +1.7.3.4 + diff --git a/pakfire/patches/pakfire-0.9.20-update-repositories-only-when-are-actually-enabled.patch b/pakfire/patches/pakfire-0.9.20-update-repositories-only-when-are-actually-enabled.patch new file mode 100644 index 0000000..e8f4132 --- /dev/null +++ b/pakfire/patches/pakfire-0.9.20-update-repositories-only-when-are-actually-enabled.patch @@ -0,0 +1,63 @@ +From 8fe602a7c5b3de4c4531d05c0dc1cf4d6bb9fb06 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Wed, 29 Feb 2012 11:10:33 +0100 +Subject: [PATCH] Update repositories only when they are actually enabled. + +--- + python/pakfire/cli.py | 8 +++++++- + python/pakfire/repository/__init__.py | 4 ++++ + python/pakfire/repository/base.py | 3 ++- + 3 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/python/pakfire/cli.py b/python/pakfire/cli.py +index 8bab886..7a94900 100644 +--- a/python/pakfire/cli.py ++++ b/python/pakfire/cli.py +@@ -768,8 +768,14 @@ class CliBuilderIntern(Cli): + + conf = config.ConfigBuilder() + ++ if self.args.nodeps: ++ disable_repos = ["*"] ++ else: ++ disable_repos = None ++ + pakfire._build(pkg, builder_mode=self.args.mode, config=conf, +- arch=self.args.arch, resultdir=self.args.resultdir) ++ disable_repos=disable_repos, arch=self.args.arch, ++ resultdir=self.args.resultdir) + + + class CliClient(Cli): +diff --git a/python/pakfire/repository/__init__.py b/python/pakfire/repository/__init__.py +index f6b2f6e..39872da 100644 +--- a/python/pakfire/repository/__init__.py ++++ b/python/pakfire/repository/__init__.py +@@ -68,6 +68,10 @@ class Repositories(object): + + # Disable all repositories here as demanded on commandline + if disable_repos: ++ # * is magic to disable all repositories. ++ if "*" in disable_repos: ++ disable_repos = [r.name for r in self] ++ + for repo in disable_repos: + self.disable_repo(repo) + +diff --git a/python/pakfire/repository/base.py b/python/pakfire/repository/base.py +index 7fb8362..59d8615 100644 +--- a/python/pakfire/repository/base.py ++++ b/python/pakfire/repository/base.py +@@ -115,7 +115,8 @@ class RepositoryFactory(object): + """ + assert self.index + +- self.index.update(force, offline=offline) ++ if force or self.enabled: ++ self.index.update(force, offline=offline) + + def clean(self): + """ +-- +1.7.3.4 + hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. 36480f231881d88be7b4083db78689f1a344c00f
by git＠ipfire.org 29 Feb '12

29 Feb '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. 5aa55777bf792f1d0ca9105083de54cac0105d1e
by git＠ipfire.org 29 Feb '12

29 Feb '12

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, kernel-update has been updated via 5aa55777bf792f1d0ca9105083de54cac0105d1e (commit) from 1482dd19e2892ec7949d302911d80884e05554bf (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 5aa55777bf792f1d0ca9105083de54cac0105d1e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 29 10:35:49 2012 +0100 kernel: Enable support for UFS. This reverts commit 7d87d796c7823eb66843dbe0a99f795be48f5ef6. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 8 +++++--- config/kernel/kernel.config.i586-ipfire-pae | 4 +++- config/kernel/kernel.config.i586-ipfire-xen | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index dfa11f0..7065f10 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.41-ipfire -# Tue May 31 14:26:02 2011 +# Linux kernel version: 2.6.32.45-ipfire +# Thu Dec 29 15:16:04 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3593,7 +3593,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index fbce15f..864a86a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -3624,7 +3624,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 5b9d74d..955d5d6 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -3385,7 +3385,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. 1482dd19e2892ec7949d302911d80884e05554bf
by git＠ipfire.org 28 Feb '12

28 Feb '12

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, kernel-update has been updated via 1482dd19e2892ec7949d302911d80884e05554bf (commit) via e6de529fb80231b0268f56b791415dd46cd91a75 (commit) via 68f7ce8f1e70cb48c9f8412c4a435a61b9d434b2 (commit) via c63b2610e958248632e9245363cb24e21624b7f1 (commit) from e0ece8e7cca18bc4521256d013a3e8e550a851c2 (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 1482dd19e2892ec7949d302911d80884e05554bf Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 28 23:55:33 2012 +0100 alsa: rootfile update. commit e6de529fb80231b0268f56b791415dd46cd91a75 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 28 23:54:49 2012 +0100 v4l-dvb: update it913x modul to 1.25. commit 68f7ce8f1e70cb48c9f8412c4a435a61b9d434b2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 28 23:53:13 2012 +0100 alsa: update to 1.0.25. commit c63b2610e958248632e9245363cb24e21624b7f1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 28 20:38:50 2012 +0100 kernel: compile also ohci into the kernel. ----------------------------------------------------------------------- Summary of changes: .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 2 +- .../kernel/kernel.config.armv5tel-ipfire-versatile | 2 +- config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- config/kernel/kernel.config.i586-ipfire-xen | 2 +- config/rootfiles/packages/alsa | 117 ++++++++++++++++++++ lfs/alsa | 20 ++-- lfs/v4l-dvb | 7 +- 8 files changed, 138 insertions(+), 16 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index c5d7408..619a6d7 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -2660,7 +2660,7 @@ CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_ISP1362_HCD is not set -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set diff --git a/config/kernel/kernel.config.armv5tel-ipfire-versatile b/config/kernel/kernel.config.armv5tel-ipfire-versatile index cc7091e..9847046 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-versatile +++ b/config/kernel/kernel.config.armv5tel-ipfire-versatile @@ -2653,7 +2653,7 @@ CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_ISP1362_HCD is not set -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index edea03b..dfa11f0 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -3050,7 +3050,7 @@ CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_ISP1362_HCD=m -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index ddb7ef9..fbce15f 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -3075,7 +3075,7 @@ CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_ISP1362_HCD=m -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index f5ad921..5b9d74d 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -2796,7 +2796,7 @@ CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_ISP1362_HCD=m -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index c9db150..b8fee57 100644 --- a/config/rootfiles/packages/alsa +++ b/config/rootfiles/packages/alsa @@ -173,6 +173,119 @@ usr/include/alsa/sound/hdspm.h #usr/include/alsa/timer.h #usr/include/alsa/use-case.h #usr/include/alsa/version.h +#usr/include/sound +#usr/include/sound/ac97_codec.h +#usr/include/sound/aci.h +#usr/include/sound/ad1816a.h +#usr/include/sound/ad1843.h +#usr/include/sound/adau1373.h +#usr/include/sound/ak4113.h +#usr/include/sound/ak4114.h +#usr/include/sound/ak4117.h +#usr/include/sound/ak4531_codec.h +#usr/include/sound/ak4641.h +#usr/include/sound/ak4xxx-adda.h +#usr/include/sound/alc5623.h +#usr/include/sound/asequencer.h +#usr/include/sound/asoundef.h +#usr/include/sound/asound_fm.h +#usr/include/sound/asound.h +#usr/include/sound/atmel-abdac.h +#usr/include/sound/atmel-ac97c.h +#usr/include/sound/compress_driver.h +#usr/include/sound/compress_offload.h +#usr/include/sound/compress_params.h +#usr/include/sound/control.h +#usr/include/sound/core.h +#usr/include/sound/cs4231-regs.h +#usr/include/sound/cs4271.h +#usr/include/sound/cs46xx_dsp_scb_types.h +#usr/include/sound/cs46xx_dsp_spos.h +#usr/include/sound/cs46xx_dsp_task_types.h +#usr/include/sound/cs46xx.h +#usr/include/sound/cs8403.h +#usr/include/sound/cs8427.h +#usr/include/sound/emu10k1.h +#usr/include/sound/emu10k1_synth.h +#usr/include/sound/emu8000.h +#usr/include/sound/emu8000_reg.h +#usr/include/sound/emux_legacy.h +#usr/include/sound/emux_synth.h +#usr/include/sound/es1688.h +#usr/include/sound/gus.h +#usr/include/sound/hda_hwdep.h +#usr/include/sound/hdsp.h +#usr/include/sound/hdspm.h +#usr/include/sound/hwdep.h +#usr/include/sound/i2c.h +#usr/include/sound/info.h +#usr/include/sound/initval.h +#usr/include/sound/jack.h +#usr/include/sound/l3.h +#usr/include/sound/max98088.h +#usr/include/sound/max98095.h +#usr/include/sound/memalloc.h +#usr/include/sound/minors.h +#usr/include/sound/mixer_oss.h +#usr/include/sound/mpu401.h +#usr/include/sound/opl3.h +#usr/include/sound/opl4.h +#usr/include/sound/pcm.h +#usr/include/sound/pcm-indirect.h +#usr/include/sound/pcm_oss.h +#usr/include/sound/pcm_params.h +#usr/include/sound/pt2258.h +#usr/include/sound/pxa2xx-lib.h +#usr/include/sound/rawmidi.h +#usr/include/sound/s3c24xx_uda134x.h +#usr/include/sound/saif.h +#usr/include/sound/sb16_csp.h +#usr/include/sound/sb.h +#usr/include/sound/seq_device.h +#usr/include/sound/seq_kernel.h +#usr/include/sound/seq_midi_emul.h +#usr/include/sound/seq_midi_event.h +#usr/include/sound/seq_oss.h +#usr/include/sound/seq_oss_legacy.h +#usr/include/sound/seq_virmidi.h +#usr/include/sound/sfnt_info.h +#usr/include/sound/sh_dac_audio.h +#usr/include/sound/sh_fsi.h +#usr/include/sound/snd_wavefront.h +#usr/include/sound/soc-dai.h +#usr/include/sound/soc-dapm.h +#usr/include/sound/soc.h +#usr/include/sound/soundfont.h +#usr/include/sound/sta32x.h +#usr/include/sound/tea575x-tuner.h +#usr/include/sound/tea6330t.h +#usr/include/sound/timer.h +#usr/include/sound/tlv320aic32x4.h +#usr/include/sound/tlv320aic3x.h +#usr/include/sound/tlv320dac33-plat.h +#usr/include/sound/tlv.h +#usr/include/sound/tpa6130a2-plat.h +#usr/include/sound/trident.h +#usr/include/sound/uda134x.h +#usr/include/sound/uda1380.h +#usr/include/sound/util_mem.h +#usr/include/sound/version.h +#usr/include/sound/vx_core.h +#usr/include/sound/wavefront.h +#usr/include/sound/wm1250-ev1.h +#usr/include/sound/wm2000.h +#usr/include/sound/wm5100.h +#usr/include/sound/wm8903.h +#usr/include/sound/wm8904.h +#usr/include/sound/wm8955.h +#usr/include/sound/wm8960.h +#usr/include/sound/wm8962.h +#usr/include/sound/wm8993.h +#usr/include/sound/wm8996.h +#usr/include/sound/wm9081.h +#usr/include/sound/wm9090.h +#usr/include/sound/wss.h +#usr/include/sound/ymfpci.h #usr/include/sys/asoundlib.h #usr/lib/alsa-lib #usr/lib/alsa-lib/smixer @@ -274,6 +387,8 @@ usr/sbin/alsactl #usr/share/aclocal/alsa.m4 usr/share/alsa #usr/share/alsa/alsa.conf +#usr/share/alsa/alsa.conf.d +usr/share/alsa/alsa.conf.d/README #usr/share/alsa/cards #usr/share/alsa/cards/AACI.conf #usr/share/alsa/cards/aliases.alisp @@ -300,7 +415,9 @@ usr/share/alsa #usr/share/alsa/cards/ENS1370.conf #usr/share/alsa/cards/ENS1371.conf #usr/share/alsa/cards/ES1968.conf +#usr/share/alsa/cards/FireWave.conf #usr/share/alsa/cards/FM801.conf +#usr/share/alsa/cards/FWSpeakers.conf #usr/share/alsa/cards/GUS.conf #usr/share/alsa/cards/HDA-Intel.conf #usr/share/alsa/cards/ICE1712.conf diff --git a/lfs/alsa b/lfs/alsa index dadaa14..54b898f 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -25,10 +25,10 @@ include Config -VER = 1.0.24.1 -UVER = 1.0.24.2 -FVER = 1.0.24.1 -DVER = 1.0.24 +VER = 1.0.25 +UVER = 1.0.25 +FVER = 1.0.25 +DVER = 1.0.25 VERSUFIX = ipfire$(KCFG) @@ -37,7 +37,7 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = alsa -PAK_VER = 9 +PAK_VER = 10 DEPS = "" @@ -59,10 +59,10 @@ alsa-utils-$(UVER).tar.bz2 = $(DL_FROM)/alsa-utils-$(UVER).tar.bz2 alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2 alsa-driver-$(DVER).tar.bz2 = $(DL_FROM)/alsa-driver-$(DVER).tar.bz2 -$(DL_FILE)_MD5 = 7cc05f25e1d5b65da8fb3fdcd540f226 -alsa-utils-$(UVER).tar.bz2_MD5 = 8238cd57cb301d1c36bcf0ecb59ce6b2 -alsa-firmware-$(FVER).tar.bz2_MD5 = d37434dfcfececd8581d2f0bbe2fcf1b -alsa-driver-$(DVER).tar.bz2_MD5 = a4ffd80745ce5098dfd48d83c2769e0e +$(DL_FILE)_MD5 = 06fe5819020c6684b991dcffc5471304 +alsa-utils-$(UVER).tar.bz2_MD5 = f81f9dcb9a014fd32cb3a70066a5b9a9 +alsa-firmware-$(FVER).tar.bz2_MD5 = f1939da45b162c83a726c54a470ef139 +alsa-driver-$(DVER).tar.bz2_MD5 = ac56465c262ced60b5eb2d6492d7a923 install : $(TARGET) @@ -104,7 +104,7 @@ ifeq "$(KMOD)" "1" cd $(DIR_SRC)/alsa-driver-$(DVER) && make install else cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --enable-static + cd $(DIR_APP) && ./configure cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(UVER).tar.bz2 diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb index a06a845..3b3d22b 100644 --- a/lfs/v4l-dvb +++ b/lfs/v4l-dvb @@ -37,11 +37,14 @@ TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) v4l-dvb_update_it913x_1_25.patch.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) +v4l-dvb_update_it913x_1_25.patch.gz = $(DL_FROM)/v4l-dvb_update_it913x_1_25.patch.gz $(DL_FILE)_MD5 = 264c5f4ad7aad8dd2960799c80a7908c +v4l-dvb_update_it913x_1_25.patch.gz_MD5 = c3e397bd64f618edbfcaa56466cdbf14 + install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -70,6 +73,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP)/linux && zcat $(DIR_DL)/v4l-dvb_update_it913x_1_25.patch.gz | \ + patch -Np1 cd $(DIR_APP) && make allyesconfig KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32 cd $(DIR_APP) && make all KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32 cd $(DIR_APP) && make install KERNELRELEASE=$(KVER)-$(VERSUFIX) VER=2.6.32 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 831339b09c4c2f0cf6d0b76f8d33b07ddef2cf32
by git＠ipfire.org 28 Feb '12

28 Feb '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 208ef3422a0b06787d6f79a9c480be4aa1f63a09
by git＠ipfire.org 25 Feb '12

25 Feb '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 205808000a2de2017507b6f1097384aeb707e848
by git＠ipfire.org 25 Feb '12

25 Feb '12

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 205808000a2de2017507b6f1097384aeb707e848 (commit) via 6287a80849e9a073828d9cbe8740232ecdb5fd78 (commit) via 13d707374fb40f93b9d550cf4d2cfc6170bc6830 (commit) via 8154cfb6d03ea0bf639514fdbfd256c73603a4e1 (commit) via 1df93f9dca74c014046a41e23eac65eb54e8dab3 (commit) via 815db6395d645942167d0ba1583eb3cf0001ce6c (commit) via 56c5b2e4513dee8176a37fa3e82f631057ff014f (commit) from 8d6a80f7ad2f09a85410196d48be051507219518 (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 205808000a2de2017507b6f1097384aeb707e848 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 25 20:37:04 2012 +0100 glibc: Package glibc locale in glibc-common package. commit 6287a80849e9a073828d9cbe8740232ecdb5fd78 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 25 20:36:02 2012 +0100 xorg-x11-server: Make package work on x86_64. commit 13d707374fb40f93b9d550cf4d2cfc6170bc6830 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 25 20:35:31 2012 +0100 wireless-tools: Make package work on x86_64. commit 8154cfb6d03ea0bf639514fdbfd256c73603a4e1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 25 20:34:52 2012 +0100 nfs-utils: Remove two unneeded configure switches. commit 1df93f9dca74c014046a41e23eac65eb54e8dab3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 25 20:33:58 2012 +0100 iscsi-initiator-utils: Make package work on x86_64. commit 815db6395d645942167d0ba1583eb3cf0001ce6c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 25 20:33:19 2012 +0100 initscripts: Change syntax of dependencies. The old format is deprecated. commit 56c5b2e4513dee8176a37fa3e82f631057ff014f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 25 20:32:03 2012 +0100 binutils: Package static libs correctly on x86_64. ----------------------------------------------------------------------- Summary of changes: binutils/binutils.nm | 2 +- glibc/glibc.nm | 3 ++- initscripts/initscripts.nm | 7 +++++-- iscsi-initiator-utils/iscsi-initiator-utils.nm | 17 ++++++++--------- nfs-utils/nfs-utils.nm | 4 +--- wireless-tools/wireless-tools.nm | 17 ++++++++--------- xorg-x11-server/xorg-x11-server.nm | 12 ++++++------ 7 files changed, 31 insertions(+), 31 deletions(-) Difference in files: diff --git a/binutils/binutils.nm b/binutils/binutils.nm index 290baf0..e283cc8 100644 --- a/binutils/binutils.nm +++ b/binutils/binutils.nm @@ -90,7 +90,7 @@ packages # Don't package libbfd and libopcodes in the -devel package. files /usr/include - /usr/lib/*.a + %{libdir}/*.a end end diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 1ff72bf..e5a6aa0 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -5,7 +5,7 @@ name = glibc version = 2.15 -release = 2 +release = 3 thisapp = %{name}-2.15-a316c1f maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -255,6 +255,7 @@ packages /usr/bin /usr/sbin /usr/share + /usr/lib/locale !/usr/share/zoneinfo end end diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm index a7bcb8d..3b9e079 100644 --- a/initscripts/initscripts.nm +++ b/initscripts/initscripts.nm @@ -6,7 +6,7 @@ name = initscripts epoch = 1 version = 2.99 -release = 12 +release = 13 groups = System/Boot url = @@ -75,7 +75,10 @@ packages /etc/rc.local end - prerequires = coreutils shadow-utils + prerequires + coreutils + shadow-utils + end script prein groupadd -g 22 -r -f utmp diff --git a/iscsi-initiator-utils/iscsi-initiator-utils.nm b/iscsi-initiator-utils/iscsi-initiator-utils.nm index ac1dbd4..21ccd2c 100644 --- a/iscsi-initiator-utils/iscsi-initiator-utils.nm +++ b/iscsi-initiator-utils/iscsi-initiator-utils.nm @@ -5,7 +5,7 @@ name = iscsi-initiator-utils version = 6.2.0.872 -release = 1 +release = 2 groups = Networking/Tools url = http://bridge.sourceforge.net/ @@ -52,9 +52,9 @@ build mkdir -pv %{BUILDROOT}/etc/NetworkManager/dispatcher.d mkdir -pv %{BUILDROOT}/var/lib/iscsi/{nodes,send_targets,static,isns,slp,ifaces} mkdir -pv %{BUILDROOT}/var/lock/iscsi - mkdir -pv %{BUILDROOT}/usr/lib mkdir -pv %{BUILDROOT}/usr/include - mkdir -pv %{BUILDROOT}/usr/lib/python2.7/site-packages + mkdir -pv %{BUILDROOT}%{libdir} + mkdir -pv %{BUILDROOT}%{libdir}/python2.7/site-packages install -p -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart \ %{BUILDROOT}/sbin @@ -66,24 +66,23 @@ build install -p -m 755 %{DIR_SOURCE}/04-iscsi %{BUILDROOT}/etc/NetworkManager/dispatcher.d - install -p -m 755 libiscsi/libiscsi.so.0 %{BUILDROOT}/usr/lib - ln -svf libiscsi.so.0 %{BUILDROOT}/usr/lib/libiscsi.so + install -p -m 755 libiscsi/libiscsi.so.0 %{BUILDROOT}%{libdir} + ln -svf libiscsi.so.0 %{BUILDROOT}%{libdir}/libiscsi.so install -p -m 644 libiscsi/libiscsi.h %{BUILDROOT}/usr/include install -p -m 755 libiscsi/build/lib.linux-*/libiscsimodule.so \ - %{BUILDROOT}/usr/lib/python2.7/site-packages + %{BUILDROOT}%{libdir}/python2.7/site-packages end end packages package %{name} - end package libiscsi template LIBS files - /usr/lib*/libiscsi.so.* + %{libdir}/libiscsi.so.* end end @@ -91,7 +90,7 @@ packages template DEVEL files - /usr/lib/libiscsi.so + %{libdir}/libiscsi.so /usr/include end end diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm index e75e28a..f40ad2f 100644 --- a/nfs-utils/nfs-utils.nm +++ b/nfs-utils/nfs-utils.nm @@ -5,7 +5,7 @@ name = nfs-utils version = 1.2.2 -release = 1 +release = 2 groups = Networking/Tools url = http://nfs.sourceforge.net/ @@ -34,8 +34,6 @@ build end configure_options += \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ --without-tcp-wrappers \ --disable-static \ --enable-tirpc=no \ diff --git a/wireless-tools/wireless-tools.nm b/wireless-tools/wireless-tools.nm index 44a5f73..24387cc 100644 --- a/wireless-tools/wireless-tools.nm +++ b/wireless-tools/wireless-tools.nm @@ -3,9 +3,10 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -name = wireless_tools +name = wireless-tools version = 29 -release = 1 +release = 2 +thisapp = wireless_tools.%{version} groups = Networking/Wireless url = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html @@ -19,8 +20,6 @@ description specific stats for wireless networking equipment. end -thisapp = %{name}.%{version} - source_dl = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/ build @@ -32,13 +31,13 @@ build make_install_targets += \ PREFIX=%{BUILDROOT}/usr \ INSTALL_DIR=%{BUILDROOT}/sbin \ - INSTALL_LIB=%{BUILDROOT}/lib \ - INSTALL_MAN=%{BUILDROOT}/usr/share/man + INSTALL_LIB=%{BUILDROOT}/%{lib} \ + INSTALL_MAN=%{BUILDROOT}%{mandir} install_cmds - rm -vf %{BUILDROOT}/lib/libiw.{a,so} - mkdir -pv %{BUILDROOT}/usr/lib - ln -svf ../../lib/libiw.so.%{version} %{BUILDROOT}/usr/lib/libiw.so + rm -vf %{BUILDROOT}/%{lib}/libiw.{a,so} + mkdir -pv %{BUILDROOT}%{libdir} + ln -svf ../../%{lib}/libiw.so.%{version} %{BUILDROOT}%{libdir}/libiw.so end end diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm index 7ed9a8b..060b4e2 100644 --- a/xorg-x11-server/xorg-x11-server.nm +++ b/xorg-x11-server/xorg-x11-server.nm @@ -5,7 +5,7 @@ name = xorg-x11-server version = 1.8.2 -release = 4 +release = 5 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = X/Server @@ -76,8 +76,8 @@ build --enable-xselinux \ --with-int10=x86emu \ --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ - --with-module-dir=/usr/lib/xorg/modules \ - --with-builderstring="Build ID: $(PKG_NAME) $(PKG_VER)-$(PKG_REL)" \ + --with-module-dir=%{libdir}/xorg/modules \ + --with-builderstring="Build ID: %{name} %{version}-%{release}" \ --with-os-name="$(hostname -s) $(uname -r)" \ --with-vendor-name="$(DISTRO_NAME) Project" \ --with-vendor-web="http://www.ipfire.org" \ @@ -114,11 +114,11 @@ build end make_install_targets += \ - moduledir=/usr/lib/xorg/modules + moduledir=%{libdir}/xorg/modules install_cmds - rm -vf $(BUILDROOT)/usr/lib/xorg/modules/libxf8_16bpp.so - rm -vrf $(BUILDROOT)/var/log + rm -vf %{BUILDROOT}%{libdir}/xorg/modules/libxf8_16bpp.so + rm -vrf %{BUILDROOT}/var/log mkdir -pv %{BUILDROOT}/etc/X11/xorg.conf.d %{BUILDROOT}/usr/share/xorg install -m 0444 hw/xfree86/common/{vesa,extra}modes %{BUILDROOT}/usr/share/xorg/ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8d6a80f7ad2f09a85410196d48be051507219518
by git＠ipfire.org 25 Feb '12

25 Feb '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f0fb701144c5ec2bb974b18fa1cae930d11b6141
by git＠ipfire.org 25 Feb '12

25 Feb '12

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 f0fb701144c5ec2bb974b18fa1cae930d11b6141 (commit) from e87a04764f162d83bec9fdfad6a31af429225625 (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 f0fb701144c5ec2bb974b18fa1cae930d11b6141 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 23 00:51:42 2012 +0100 ghostscript: Add some dependencies that enhance functionality. Link to libpng to read and write PNG images. ----------------------------------------------------------------------- Summary of changes: ghostscript/ghostscript.nm | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Difference in files: diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm index 08d7f53..14040f7 100644 --- a/ghostscript/ghostscript.nm +++ b/ghostscript/ghostscript.nm @@ -5,7 +5,7 @@ name = ghostscript version = 9.05 -release = 1 +release = 2 groups = Applications/Printing url = http://ghostscript.com @@ -32,8 +32,11 @@ build requires cups-devel dbus-devel + expat-devel glib2-devel + libidn-devel libjpeg-devel + libpng-devel libtiff-devel libtool libxml2-devel hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. eb12fca108f40e1b66f05c2291565530050a7724
by git＠ipfire.org 25 Feb '12

25 Feb '12

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 eb12fca108f40e1b66f05c2291565530050a7724 (commit) from 968d4ea400651b48672390956ae856a9f62deba0 (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 eb12fca108f40e1b66f05c2291565530050a7724 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 25 12:10:25 2012 +0100 openvpn: Update to 2.2.2. Add --enable-password-save switch that was requested by the community. See bug #10036. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openvpn | 6 ++++-- lfs/openvpn | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 0f2aa47..18f4d31 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -1,5 +1,6 @@ -lib/openvpn-auth-pam.so -lib/openvpn-down-root.so +usr/lib/openvpn +usr/lib/openvpn/openvpn-auth-pam.so +usr/lib/openvpn/openvpn-down-root.so usr/sbin/openvpn #usr/share/doc/openvpn #usr/share/doc/openvpn/management-notes.txt @@ -16,5 +17,6 @@ var/ipfire/ovpn/n2nconf var/ipfire/ovpn/openssl/ovpn.cnf var/ipfire/ovpn/ovpn-leases.db var/ipfire/ovpn/ovpnconfig +var/ipfire/ovpn/scripts var/ipfire/ovpn/settings var/ipfire/ovpn/verify diff --git a/lfs/openvpn b/lfs/openvpn index 41594b7..4f10e7a 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -24,7 +24,7 @@ include Config -VER = 2.2.1 +VER = 2.2.2 THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 500bee5449b29906150569aaf2eb2730 +$(DL_FILE)_MD5 = c5181e27b7945fa6276d21873329c5c7 install : $(TARGET) @@ -70,20 +70,26 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/ovpn \ - --enable-pthread + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/var/ipfire/ovpn \ + --enable-password-save \ + --enable-pthread cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire + -mkdir -pv /usr/lib/openvpn cd $(DIR_APP)/plugin/auth-pam && make - cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /lib/ + cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /usr/lib/openvpn cd $(DIR_APP)/plugin/down-root && make - cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /lib/ + cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn -mkdir -vp /var/ipfire/ovpn/ca -mkdir -vp /var/ipfire/ovpn/crls -mkdir -vp /var/ipfire/ovpn/n2nconf + -mkdir -vp /var/ipfire/ovpn/scripts touch /var/ipfire/ovpn/ovpn-leases.db chmod 700 /var/ipfire/ovpn/ovpn-leases.db + chown -R root:root /var/ipfire/ovpn/scripts chown -R nobody:nobody /var/ipfire/ovpn chown root.nobody /var/log/ovpnserver.log chmod 755 /var/ipfire/ovpn/verify hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2012