From 21405ea6a5c33114bb6ec07185e56d4c2704b989 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Thu, 27 May 2010 09:26:53 +0000 Subject: testing/[scst]: merge scst from experimental to master --- testing/iscsi-scst-svn/APKBUILD | 40 + testing/iscsi-scst-svn/iscsi-scst.initd | 23 + testing/linux-scst/APKBUILD | 122 + testing/linux-scst/arp.patch | 14 + testing/linux-scst/kernelconfig.x86 | 4674 ++++++++++++++++++++ testing/linux-scst/put_page_callback-2.6.34.patch | 390 ++ testing/linux-scst/scst_exec_req_fifo-2.6.34.patch | 529 +++ testing/scst-svn-scst/APKBUILD | 82 + testing/scstadmin-svn/APKBUILD | 30 + 9 files changed, 5904 insertions(+) create mode 100644 testing/iscsi-scst-svn/APKBUILD create mode 100644 testing/iscsi-scst-svn/iscsi-scst.initd create mode 100644 testing/linux-scst/APKBUILD create mode 100644 testing/linux-scst/arp.patch create mode 100644 testing/linux-scst/kernelconfig.x86 create mode 100644 testing/linux-scst/put_page_callback-2.6.34.patch create mode 100644 testing/linux-scst/scst_exec_req_fifo-2.6.34.patch create mode 100644 testing/scst-svn-scst/APKBUILD create mode 100644 testing/scstadmin-svn/APKBUILD (limited to 'testing') diff --git a/testing/iscsi-scst-svn/APKBUILD b/testing/iscsi-scst-svn/APKBUILD new file mode 100644 index 0000000000..9b3ec42008 --- /dev/null +++ b/testing/iscsi-scst-svn/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Carlo Landmeter +# Maintainer: Natanael Copa + +pkgname=iscsi-scst-svn +pkgver=1713 +pkgrel=0 +pkgdesc="ISCSI target for SCST - userspace tools" +url="http://iscsi-scst.sourceforge.net/" +license="GPL-2" +depends= +install= +makedepends="openssl-dev scst-svn-scst-dev" +subpackages= +source="http://alpine.nethq.org/clandmeter/src/$pkgname-$pkgver.tar.gz + iscsi-scst.initd + " + +_builddir="$srcdir"/iscsi-scst +prepare() { + cd "$_builddir" + # we need the headre file. fix dependency in makefile + sed -i -e 's/^\(progs:.*\)/\1 include\/iscsi_scst_itf_ver.h/' Makefile +} + +build() { + cd "$_builddir" + make progs \ + SCST_INC_DIR=/usr/include/scst +} + +package() { + cd "$_builddir" + # make install is broken + install -D usr/iscsi-scstd "$pkgdir"/usr/sbin/iscsi-scstd + install -D usr/iscsi-scst-adm "$pkgdir"/usr/sbin/iscsi-scst-adm + install -D -m 755 "$srcdir"/iscsi-scst.initd "$pkgdir"/etc/init.d/iscsi-scst +} + +md5sums="cf046db4f7cd9cf969b054dc055922d6 iscsi-scst-svn-1713.tar.gz +3132fae1ec2f9bcc72476d9e9f36d326 iscsi-scst.initd" diff --git a/testing/iscsi-scst-svn/iscsi-scst.initd b/testing/iscsi-scst-svn/iscsi-scst.initd new file mode 100644 index 0000000000..4d4cd76b59 --- /dev/null +++ b/testing/iscsi-scst-svn/iscsi-scst.initd @@ -0,0 +1,23 @@ +#!/sbin/runscript +# +# Start the iSCSI-SCST Target. +# + +depend() { + need net + afer firewall +} + +start() { + modprobe -q crc32c + modprobe -q iscsi-scst + ebegin "Starting iscsi-scstd" + start-stop-daemon --start --exec /usr/sbin/iscsi-scstd + eend 0 +} + +stop() { + ebegin "Stopping iscsi-scstd" + start-stop-daemon --stop --exec /usr/sbin/iscsi-scstd + eend 0 +} diff --git a/testing/linux-scst/APKBUILD b/testing/linux-scst/APKBUILD new file mode 100644 index 0000000000..bbcd830c7d --- /dev/null +++ b/testing/linux-scst/APKBUILD @@ -0,0 +1,122 @@ +_flavor=scst +pkgname=linux-${_flavor} +pkgver=2.6.34 +_kernver=$pkgver +pkgrel=0 +pkgdesc="Linux kernel with scst" +url="http://www.kernel.org" +depends="mkinitfs linux-firmware" +makedepends="perl installkernel" +options="!strip" +_config=${config:-kernelconfig.${CARCH:-x86}} +install= +source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$pkgver.tar.bz2 + arp.patch + kernelconfig.x86 + put_page_callback-2.6.34.patch + scst_exec_req_fifo-2.6.34.patch + " +# no need to patch now +#ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 +subpackages="$pkgname-dev" +license="GPL-2" + +_abi_release=${pkgver}-${_flavor} + +prepare() { + cd "$srcdir"/linux-$_kernver + if [ "$_kernver" != "$pkgver" ]; then + bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 + fi + + for i in ../*.diff ../*.patch; do + [ -f $i ] || continue + msg "Applying $i..." + patch -s -p1 -N < $i || return 1 + done + + mkdir -p "$srcdir"/build + cp "$srcdir"/$_config "$srcdir"/build/.config + echo "-${_flavor}" > "$srcdir"/linux-$_kernver/localversion-${_flavor} + make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="$CC" \ + silentoldconfig +} + +# this is so we can do: 'abuild menuconfig' to reconfigure kernel +menuconfig() { + cd "$srcdir"/build || return 1 + make menuconfig + cp .config "$startdir"/$_config +} + +build() { + cd "$srcdir"/build + make CC="$CC" || return 1 +} + +package() { + cd "$srcdir"/build + mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules + make modules_install install \ + INSTALL_MOD_PATH="$pkgdir" \ + INSTALL_PATH="$pkgdir"/boot + + rm -f "$pkgdir"/lib/modules/${_abi_release}/build \ + "$pkgdir"/lib/modules/${_abi_release}/source + rm -rf "$pkgdir"/lib/firmware + + install -D include/config/kernel.release \ + "$pkgdir"/usr/share/kernel/$_flavor/kernel.release +} + +dev() { + # copy the only the parts that we really need for build 3rd party + # kernel modules and install those as /usr/src/linux-headers, + # simlar to what ubuntu does + # + # this way you dont need to install the 300-400 kernel sources to + # build a tiny kernel module + # + pkgdesc="Headers and script for third party modules for $pkgname kernel" + local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release} + + # first we import config, run prepare to set up for building + # external modules, and create the scripts + mkdir -p "$dir" + cp "$srcdir"/$_config "$dir"/.config + make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="$CC" \ + silentoldconfig prepare scripts + + # remove the stuff that poits to real sources. we want 3rd party + # modules to believe this is the soruces + rm "$dir"/Makefile "$dir"/source + + # copy the needed stuff from real sources + # + # this is taken from ubuntu kernel build script + # http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-jaunty.git;a=blob;f=debian/rules.d/3-binary-indep.mk;hb=HEAD + cd "$srcdir"/linux-$_kernver + find . -path './include/*' -prune -o -path './scripts/*' -prune \ + -o -type f \( -name 'Makefile*' -o -name 'Kconfig*' \ + -o -name 'Kbuild*' -o -name '*.sh' -o -name '*.pl' \ + -o -name '*.lds' \) | cpio -pdm "$dir" + cp -a drivers/media/dvb/dvb-core/*.h "$dir"/drivers/media/dvb/dvb-core + cp -a drivers/media/video/*.h "$dir"/drivers/media/video + cp -a drivers/media/dvb/frontends/*.h "$dir"/drivers/media/dvb/frontends + cp -a scripts include "$dir" + find $(find arch -name include -type d -print) -type f \ + | cpio -pdm "$dir" + + install -Dm644 "$srcdir"/build/Module.symvers \ + "$dir"/Module.symvers + + mkdir -p "$subpkgdir"/lib/modules/${_abi_release} + ln -sf /usr/src/linux-headers-${_abi_release} \ + "$subpkgdir"/lib/modules/${_abi_release}/build +} + +md5sums="10eebcb0178fb4540e2165bfd7efc7ad linux-2.6.34.tar.bz2 +4c39a161d918e7f274292ecfd168b891 arp.patch +2a08789db4977397f529a2933bc7b787 kernelconfig.x86 +06e9b200ec4fe252dc1478b5f8137e9e put_page_callback-2.6.34.patch +f9ea26d08807c41407a7758ce53fc633 scst_exec_req_fifo-2.6.34.patch" diff --git a/testing/linux-scst/arp.patch b/testing/linux-scst/arp.patch new file mode 100644 index 0000000000..d2682690f5 --- /dev/null +++ b/testing/linux-scst/arp.patch @@ -0,0 +1,14 @@ +diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c +index c95cd93..71ab56f 100644 +--- a/net/ipv4/arp.c ++++ b/net/ipv4/arp.c +@@ -1200,6 +1200,9 @@ static int arp_netdev_event(struct notifier_block *this, unsigned long event, vo + neigh_changeaddr(&arp_tbl, dev); + rt_cache_flush(dev_net(dev), 0); + break; ++ case NETDEV_CHANGE: ++ neigh_changeaddr(&arp_tbl, dev); ++ break; + default: + break; + } diff --git a/testing/linux-scst/kernelconfig.x86 b/testing/linux-scst/kernelconfig.x86 new file mode 100644 index 0000000000..84aa9734b1 --- /dev/null +++ b/testing/linux-scst/kernelconfig.x86 @@ -0,0 +1,4674 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.34 +# Tue May 25 13:28:42 2010 +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +# CONFIG_NEED_DMA_MAP_STATE is not set +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_EARLY_RES=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_X86_32_SMP=y +CONFIG_X86_HT=y +CONFIG_X86_TRAMPOLINE=y +CONFIG_X86_32_LAZY_GS=y +CONFIG_KTIME_SCALAR=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +# CONFIG_RD_LZO is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +# CONFIG_KALLSYMS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +CONFIG_PERF_COUNTERS=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +CONFIG_OPROFILE=m +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_SLOW_WORK=y +# CONFIG_SLOW_WORK_DEBUG is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_SMP=y +# CONFIG_SPARSE_IRQ is not set +CONFIG_X86_MPPARSE=y +# CONFIG_X86_BIGSMP is not set +CONFIG_X86_EXTENDED_PLATFORM=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_MRST is not set +# CONFIG_X86_RDC321X is not set +# CONFIG_X86_32_NON_STANDARD is not set +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_XEN=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=8 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_VMI=y +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_LGUEST_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +CONFIG_M586TSC=y +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +# CONFIG_GENERIC_CPU is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_XADD=y +# CONFIG_X86_PPRO_FENCE is not set +CONFIG_X86_F00F_BUG=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_ALIGNMENT_16=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 +# CONFIG_PROCESSOR_SELECT is not set +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +# CONFIG_IOMMU_HELPER is not set +# CONFIG_IOMMU_API is not set +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set +# CONFIG_X86_MCE is not set +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_2G_OPT is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_HIGHPTE is not set +# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set +CONFIG_X86_RESERVE_LOW_64K=y +CONFIG_MATH_EMULATION=y +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +# CONFIG_EFI is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 +CONFIG_SCHED_HRTICK=y +# CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_HOTPLUG_CPU=y +CONFIG_COMPAT_VDSO=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management and ACPI options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_HIBERNATION is not set +# CONFIG_PM_RUNTIME is not set +CONFIG_PM_OPS=y +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +CONFIG_ACPI_PROCFS_POWER=y +# CONFIG_ACPI_POWER_METER is not set +CONFIG_ACPI_SYSFS_POWER=y +CONFIG_ACPI_PROC_EVENT=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y +# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set +CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_BLACKLIST_YEAR=2000 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=m +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_SBS=m +# CONFIG_SFI is not set +# CONFIG_APM is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +# CONFIG_X86_PCC_CPUFREQ is not set +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_POWERNOW_K6=m +CONFIG_X86_POWERNOW_K7=m +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=m +CONFIG_X86_GX_SUSPMOD=m +CONFIG_X86_SPEEDSTEP_CENTRINO=m +CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y +CONFIG_X86_SPEEDSTEP_ICH=m +CONFIG_X86_SPEEDSTEP_SMI=m +CONFIG_X86_P4_CLOCKMOD=m +CONFIG_X86_CPUFREQ_NFORCE2=m +CONFIG_X86_LONGRUN=m +CONFIG_X86_LONGHAUL=m +CONFIG_X86_E_POWERSAVER=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=m +# CONFIG_PCIEAER is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set +CONFIG_PCI_STUB=m +CONFIG_HT_IRQ=y +# CONFIG_PCI_IOV is not set +CONFIG_PCI_IOAPIC=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_MCA is not set +CONFIG_SCx200=m +CONFIG_SCx200HR_TIMER=m +# CONFIG_OLPC is not set +CONFIG_K8_NB=y +CONFIG_PCCARD=m +CONFIG_PCMCIA=m +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_I82365=m +CONFIG_TCIC=m +CONFIG_PCMCIA_PROBE=y +CONFIG_PCCARD_NONSTATIC=m +CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI_FAKE=m +CONFIG_HOTPLUG_PCI_COMPAQ=m +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_HOTPLUG_PCI_CPCI=y +CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m +CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m +CONFIG_HOTPLUG_PCI_SHPC=m + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +# CONFIG_IP_PIMSM_V1 is not set +CONFIG_IP_PIMSM_V2=y +CONFIG_ARPD=y +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_PIMSM_V2=y +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +# CONFIG_NF_CONNTRACK_ZONES is not set +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +# CONFIG_IP_VS_PROTO_SCTP is not set + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_CCID3_RTO=100 +CONFIG_IP_DCCP_TFRC_LIB=y +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +CONFIG_SCTP_HMAC_SHA1=y +# CONFIG_SCTP_HMAC_MD5 is not set +CONFIG_RDS=m +# CONFIG_RDS_RDMA is not set +# CONFIG_RDS_TCP is not set +# CONFIG_RDS_DEBUG is not set +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_DECNET=m +CONFIG_DECNET_ROUTER=y +CONFIG_LLC=m +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_LTPC=m +CONFIG_COPS=m +CONFIG_COPS_DAYNA=y +CONFIG_COPS_TANGENT=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +CONFIG_ECONET_AUNUDP=y +CONFIG_ECONET_NATIVE=y +CONFIG_WAN_ROUTER=m +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_DEV=m +# CONFIG_CAN_CALC_BITTIMING is not set +CONFIG_CAN_MCP251X=m +CONFIG_CAN_SJA1000=m +# CONFIG_CAN_SJA1000_ISA is not set +CONFIG_CAN_SJA1000_PLATFORM=m +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PLX_PCI=m + +# +# CAN USB interfaces +# +# CONFIG_CAN_EMS_USB is not set +# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_TOSHIBA_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +# CONFIG_BT_MRVL is not set +CONFIG_BT_ATH3K=m +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_WIRELESS_EXT_SYSFS=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set +CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +# CONFIG_RFKILL_INPUT is not set +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER=m +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" +CONFIG_SYS_HYPERVISOR=y +CONFIG_CONNECTOR=m +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_TESTS=m +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_AR7_PARTS=m + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_HAVE_MTD_OTP=y +CONFIG_MTD_BLKDEVS=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m +CONFIG_MTD_OOPS=m + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_SC520CDP=m +CONFIG_MTD_NETSC520=m +CONFIG_MTD_TS5500=m +CONFIG_MTD_SBC_GXX=m +CONFIG_MTD_SCx200_DOCFLASH=m +CONFIG_MTD_AMD76XROM=m +CONFIG_MTD_ICHXROM=m +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_SCB2_FLASH=m +CONFIG_MTD_NETtel=m +CONFIG_MTD_L440GX=m +CONFIG_MTD_PCI=m +# CONFIG_MTD_GPIO_ADDR is not set +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +# CONFIG_MTD_DATAFLASH_OTP is not set +CONFIG_MTD_M25P80=m +CONFIG_M25PXX_USE_FAST_READ=y +# CONFIG_MTD_SST25L is not set +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOC2000=m +CONFIG_MTD_DOC2001=m +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +CONFIG_MTD_DOCPROBE_ADVANCED=y +CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 +# CONFIG_MTD_DOCPROBE_HIGH is not set +# CONFIG_MTD_DOCPROBE_55AA is not set +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +CONFIG_MTD_NAND_ECC_SMC=y +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_ALAUDA=m +CONFIG_MTD_ONENAND=m +# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set +# CONFIG_MTD_ONENAND_GENERIC is not set +CONFIG_MTD_ONENAND_OTP=y +CONFIG_MTD_ONENAND_2X_PROGRAM=y +CONFIG_MTD_ONENAND_SIM=m + +# +# LPDDR flash memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +# CONFIG_PARPORT_1284 is not set +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_ISAPNP=y +CONFIG_PNPBIOS=y +# CONFIG_PNPBIOS_PROC_FS is not set +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +CONFIG_BLK_DEV_XD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_UB=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +CONFIG_AD525X_DPOT=m +CONFIG_IBM_ASM=m +CONFIG_PHANTOM=m +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +CONFIG_ICS932S401=m +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_ISL29003=m +CONFIG_SENSORS_TSL2550=m +CONFIG_DS1682=m +CONFIG_TI_DAC7512=m +CONFIG_VMWARE_BALLOON=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y +CONFIG_IWMC3200TOP=m +# CONFIG_IWMC3200TOP_DEBUG is not set +# CONFIG_IWMC3200TOP_DEBUGFS is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_FC_TGT_ATTRS=y +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_BE2ISCSI is not set +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_7000FASST=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set +CONFIG_AIC7XXX_DEBUG_ENABLE=y +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_BUILD_FIRMWARE is not set +CONFIG_AIC79XX_DEBUG_ENABLE=y +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +CONFIG_SCSI_MVSAS_DEBUG=y +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_SCSI_FLASHPOINT=y +CONFIG_VMWARE_PVSCSI=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_DTC3280=m +CONFIG_SCSI_EATA=m +# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set +# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_GENERIC_NCR5380=m +CONFIG_SCSI_GENERIC_NCR5380_MMIO=m +CONFIG_SCSI_GENERIC_NCR53C400=y +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_NCR53C406A=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +CONFIG_SCSI_IPR=m +CONFIG_SCSI_IPR_TRACE=y +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_PAS16=m +CONFIG_SCSI_QLOGIC_FAS=m +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_SYM53C416=m +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +CONFIG_SCSI_T128=m +CONFIG_SCSI_U14_34F=m +# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set +# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set +CONFIG_SCSI_U14_34F_MAX_TAGS=8 +CONFIG_SCSI_ULTRASTOR=m +CONFIG_SCSI_NSP32=m +CONFIG_SCSI_DEBUG=m +# CONFIG_SCSI_PMCRAID is not set +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +# CONFIG_SCSI_BFA_FC is not set +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m +CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y +CONFIG_SATA_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y +CONFIG_SATA_SVW=m +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SX4=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m +CONFIG_SATA_INIC162X=m +CONFIG_PATA_ACPI=m +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +CONFIG_PATA_HPT3X3_DMA=y +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_IT8213=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_LEGACY=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m +CONFIG_PATA_WINBOND_VLB=m +CONFIG_PATA_PLATFORM=m +CONFIG_PATA_SCH=m +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +# CONFIG_MD_AUTODETECT is not set +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_RAID6_PQ=m +# CONFIG_ASYNC_RAID6_TEST is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +CONFIG_DM_DELAY=m +# CONFIG_DM_UEVENT is not set +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 +CONFIG_FUSION_CTL=m +# CONFIG_FUSION_LOGGING is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# The newer stack is recommended. +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_OHCI_DEBUG=y +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_IEEE1394=m +CONFIG_IEEE1394_OHCI1394=m +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_RAWIO=m +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_DV1394=m +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +CONFIG_I2O_BUS=m +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +CONFIG_IFB=m +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_NET_SB1000=m +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +CONFIG_ARCNET_CAP=m +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +CONFIG_ARCNET_COM20020=m +CONFIG_ARCNET_COM20020_ISA=m +CONFIG_ARCNET_COM20020_PCI=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_GPIO=m +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL1=m +CONFIG_EL2=m +CONFIG_ELPLUS=m +CONFIG_EL16=m +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_LANCE=m +CONFIG_NET_VENDOR_SMC=y +CONFIG_WD80x3=m +CONFIG_ULTRA=m +CONFIG_SMC9194=m +CONFIG_ENC28J60=m +# CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_ETHOC=m +CONFIG_NET_VENDOR_RACAL=y +CONFIG_NI52=m +CONFIG_NI65=m +CONFIG_DNET=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_AT1700=m +CONFIG_DEPCA=m +CONFIG_HP100=m +CONFIG_NET_ISA=y +CONFIG_E2100=m +CONFIG_EWRK3=m +CONFIG_EEXPRESS=m +CONFIG_EEXPRESS_PRO=m +CONFIG_HPLAN_PLUS=m +CONFIG_HPLAN=m +CONFIG_LP486E=m +CONFIG_ETH16I=m +CONFIG_NE2000=m +CONFIG_ZNET=m +CONFIG_SEEQ8005=m +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +CONFIG_AMD8111_ETH=m +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_AC3200=m +CONFIG_KSZ884X_PCI=m +CONFIG_APRICOT=m +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_CS89x0=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R6040=m +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_KS8842=m +CONFIG_KS8851=m +CONFIG_KS8851_MLL=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_SC92031=m +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_ATL2=m +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IP1000=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +CONFIG_R8169_VLAN=y +CONFIG_SIS190=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_JME=m +CONFIG_NETDEV_10000=y +CONFIG_MDIO=m +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3_DEPENDS=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4_DEPENDS=y +CONFIG_CHELSIO_T4=m +CONFIG_ENIC=m +CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGB=m +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_BE2NET=m +# CONFIG_TR is not set +CONFIG_WLAN=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_LIBERTAS_THINFIRM_USB=m +CONFIG_AIRO=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m +CONFIG_AIRO_CS=m +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_MAC80211_HWSIM=m +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +# CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_AR9170_USB=m +CONFIG_AR9170_LEDS=y +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_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_HOSTAP_CS=m +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLAGN=m +CONFIG_IWL4965=y +CONFIG_IWL5000=y +CONFIG_IWL3945=m +CONFIG_IWM=m +# CONFIG_IWM_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_LIBERTAS_MESH 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_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI_PCI=y +CONFIG_RT2800PCI=m +# CONFIG_RT2800PCI_RT30XX is not set +# CONFIG_RT2800PCI_RT35XX is not set +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +# CONFIG_RT2800USB_RT30XX is not set +# CONFIG_RT2800USB_RT35XX is not set +# CONFIG_RT2800USB_UNKNOWN is not set +CONFIG_RT2800_LIB=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_WL12XX=m +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL1271=m +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_SDIO=m +# CONFIG_WIMAX_IWMC3200_SDIO is not set +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_CDC_PHONET=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +CONFIG_ARCNET_COM20020_CS=m +CONFIG_WAN=y +CONFIG_HOSTESS_SV11=m +CONFIG_COSA=m +CONFIG_LANMEDIA=m +CONFIG_SEALEVEL_4021=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_PPP=m +CONFIG_HDLC_X25=m +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +# CONFIG_WANXL_BUILD_FIRMWARE is not set +CONFIG_PC300TOO=m +CONFIG_N2=m +CONFIG_C101=m +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +CONFIG_DSCC4_PCISYNC=y +CONFIG_DSCC4_PCI_RST=y +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +CONFIG_SDLA=m +CONFIG_WAN_ROUTER_DRIVERS=m +CONFIG_CYCLADES_SYNC=m +CONFIG_CYCLOMX_X25=y +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_SBNI=m +CONFIG_SBNI_MULTILINE=y +CONFIG_ATM_DRIVERS=y +CONFIG_ATM_DUMMY=m +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +CONFIG_ATM_NICSTAR=m +CONFIG_ATM_NICSTAR_USE_SUNI=y +CONFIG_ATM_NICSTAR_USE_IDT77105=y +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +CONFIG_ATM_IA=m +# CONFIG_ATM_IA_DEBUG is not set +CONFIG_ATM_FORE200E=m +CONFIG_ATM_FORE200E_USE_TASKLET=y +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_HE=m +CONFIG_ATM_HE_USE_SUNI=y +CONFIG_ATM_SOLOS=m +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +CONFIG_HIPPI=y +CONFIG_ROADRUNNER=m +# CONFIG_ROADRUNNER_LARGE_RINGS is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +# CONFIG_NET_FC is not set +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_VIRTIO_NET=m +CONFIG_VMXNET3=m +CONFIG_ISDN=y +# CONFIG_ISDN_I4L is not set +CONFIG_ISDN_CAPI=m +# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set +# CONFIG_CAPI_TRACE is not set +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +# CONFIG_HYSDN_CAPI is not set +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +# CONFIG_MISDN_SPEEDFAX is not set +# CONFIG_MISDN_INFINEON is not set +# CONFIG_MISDN_W6692 is not set +# CONFIG_MISDN_NETJET is not set +CONFIG_MISDN_IPAC=m +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVBUG=m +CONFIG_XEN_KBDDEV_FRONTEND=m + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +CONFIG_KEYBOARD_ATKBD=y +CONFIG_QT2160=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_MATRIX=m +CONFIG_KEYBOARD_LM8323=m +# CONFIG_KEYBOARD_MAX7359 is not set +CONFIG_KEYBOARD_NEWTON=m +# CONFIG_KEYBOARD_OPENCORES is not set +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_INPORT=m +# CONFIG_MOUSE_ATIXL is not set +CONFIG_MOUSE_LOGIBM=m +CONFIG_MOUSE_PC110PAD=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_MOUSE_GPIO=m +CONFIG_MOUSE_SYNAPTICS_I2C=m +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +# CONFIG_TOUCHSCREEN_MCS5000 is not set +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_HTCPEN=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC5UH=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_WINBOND_CIR=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_COMPUTONE=m +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +CONFIG_DIGIEPCA=m +CONFIG_MOXA_INTELLIO=m +CONFIG_MOXA_SMARTIO=m +CONFIG_ISI=m +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_N_HDLC=m +CONFIG_RISCOM8=m +CONFIG_SPECIALIX=m +CONFIG_STALDRV=y +CONFIG_STALLION=m +CONFIG_ISTALLION=m +CONFIG_NOZOMI=m + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_FOURPORT=m +CONFIG_SERIAL_8250_ACCENT=m +CONFIG_SERIAL_8250_BOCA=m +CONFIG_SERIAL_8250_EXAR_ST16C554=m +CONFIG_SERIAL_8250_HUB6=m +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MAX3100=m +CONFIG_SERIAL_UARTLITE=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_TIMBERDALE=m +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=m +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_NVRAM=m +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_SCx200_GPIO=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_CS5535_GPIO=m +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 +CONFIG_HPET=y +CONFIG_HPET_MMAP=y +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_GPIO=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=m + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m +CONFIG_I2C_TINY_USB=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_ISA=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_STUB=m +CONFIG_SCx200_I2C=m +CONFIG_SCx200_I2C_SCL=12 +CONFIG_SCx200_I2C_SDA=13 +CONFIG_SCx200_ACB=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_XILINX=m +CONFIG_SPI_XILINX_PLTFM=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_PCI=m + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_GPIO_SYSFS is not set +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO expanders: +# +CONFIG_GPIO_IT8761E=m +CONFIG_GPIO_SCH=m + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_WM8994=m +CONFIG_GPIO_ADP5588=m + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=m +# CONFIG_GPIO_LANGWELL is not set +# CONFIG_GPIO_TIMBERDALE is not set + +# +# SPI GPIO expanders: +# +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MCP23S08=m +# CONFIG_GPIO_MC33880 is not set + +# +# AC97 GPIO expanders: +# +# CONFIG_GPIO_UCB1400 is not set +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_BQ27000=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_BATTERY_DS2760=m +CONFIG_BATTERY_DS2782=m +CONFIG_BATTERY_BQ27x00=m +CONFIG_BATTERY_MAX17040=m +CONFIG_CHARGER_PCF50633=m +CONFIG_HWMON=m +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_SENSORS_APPLESMC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ATK0110=m +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_GEODE_WDT=m +CONFIG_SC520_WDT=m +# CONFIG_SBC_FITPC2_WATCHDOG is not set +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +# CONFIG_HP_WATCHDOG is not set +CONFIG_SC1200_WDT=m +CONFIG_SCx200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_SBC7240_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +CONFIG_PCWATCHDOG=m +CONFIG_MIXCOMWD=m +CONFIG_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +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_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=m +CONFIG_MFD_SM501=m +# CONFIG_MFD_SM501_GPIO is not set +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +CONFIG_TPS65010=m +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_WM8994=m +CONFIG_MFD_PCF50633=m +# CONFIG_MFD_MC13783 is not set +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +# CONFIG_EZX_PCAP is not set +CONFIG_AB4500_CORE=m +CONFIG_MFD_TIMBERDALE=m +CONFIG_LPC_SCH=m +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_DUMMY is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_USERSPACE_CONSUMER=m +CONFIG_REGULATOR_BQ24022=m +CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX8649=m +CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_WM8400=m +CONFIG_REGULATOR_WM8994=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_LP3971=m +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +# CONFIG_VIDEO_ALLOW_V4L1 is not set +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_DVB_CORE=m +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_IR_CORE=m +CONFIG_VIDEO_IR=m +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set +CONFIG_VIDEO_IR_I2C=m + +# +# Encoders/decoders and other helper chips +# + +# +# Audio decoders +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +# CONFIG_VIDEO_ADV7180 is not set +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_TCM825X=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_SAA7191=m +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_ADV7343=m + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_SAA7164=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9T031=m +CONFIG_SOC_CAMERA_MT9T112=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_SOC_CAMERA_RJ54N1=m +CONFIG_SOC_CAMERA_TW9910=m +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_SOC_CAMERA_OV772X=m +CONFIG_SOC_CAMERA_OV9640=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SN9C20X_EVDEV=y +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_USBVISION=m +CONFIG_USB_ET61X251=m +CONFIG_USB_SN9C102=m +CONFIG_USB_ZC0301=m +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_CADET=m +CONFIG_RADIO_RTRACK=m +CONFIG_RADIO_RTRACK2=m +CONFIG_RADIO_AZTECH=m +CONFIG_RADIO_GEMTEK=m +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_RADIO_MIROPCM20=m +CONFIG_RADIO_SF16FMI=m +CONFIG_RADIO_SF16FMR2=m +CONFIG_RADIO_TERRATEC=m +CONFIG_RADIO_TRUST=m +CONFIG_RADIO_TYPHOON=m +CONFIG_RADIO_ZOLTRIX=m +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set +CONFIG_USB_DSBR=m +# CONFIG_RADIO_SI470X is not set +CONFIG_USB_MR800=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_TIMBERDALE=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m +# CONFIG_DVB_USB_FRIIO is not set +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_SIANO_MDTV=m + +# +# Siano module components +# +CONFIG_SMS_USB_DRV=m +CONFIG_SMS_SDIO_DRV=m + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +CONFIG_DVB_PLUTO2=m + +# +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_FIREWIRE=y +CONFIG_DVB_FIREDTV_IEEE1394=y +CONFIG_DVB_FIREDTV_INPUT=y + +# +# Supported Earthsoft PT1 Adapters +# +# CONFIG_DVB_PT1 is not set + +# +# Supported Mantis Adapters +# +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m + +# +# Supported nGene Adapters +# +CONFIG_DVB_NGENE=m + +# +# Supported DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_S5H1411=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DAB=y +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_AGP=m +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m +CONFIG_AGP_AMD64=m +CONFIG_AGP_INTEL=m +CONFIG_AGP_NVIDIA=m +CONFIG_AGP_SIS=m +CONFIG_AGP_SWORKS=m +CONFIG_AGP_VIA=m +CONFIG_AGP_EFFICEON=m +# CONFIG_VGA_ARB is not set +# CONFIG_VGA_SWITCHEROO is not set +CONFIG_DRM=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_TTM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON_KMS is not set +CONFIG_DRM_I810=m +CONFIG_DRM_I830=m +CONFIG_DRM_I915=m +# CONFIG_DRM_I915_KMS is not set +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=m +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB_DDC=m +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=m +CONFIG_FB_CFB_COPYAREA=m +CONFIG_FB_CFB_IMAGEBLIT=m +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=m +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_HECUBA=m +CONFIG_FB_SVGALIB=m +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +CONFIG_FB_CIRRUS=m +CONFIG_FB_PM2=m +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=m +CONFIG_FB_ARC=m +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m +CONFIG_FB_N411=m +CONFIG_FB_HGA=m +# CONFIG_FB_HGA_ACCEL is not set +CONFIG_FB_S1D13XXX=m +CONFIG_FB_NVIDIA=m +CONFIG_FB_NVIDIA_I2C=y +# CONFIG_FB_NVIDIA_DEBUG is not set +CONFIG_FB_NVIDIA_BACKLIGHT=y +CONFIG_FB_RIVA=m +CONFIG_FB_RIVA_I2C=y +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_RIVA_BACKLIGHT=y +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y +CONFIG_FB_MATROX=m +CONFIG_FB_MATROX_MILLENIUM=y +CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y +CONFIG_FB_ATY=m +CONFIG_FB_ATY_CT=y +CONFIG_FB_ATY_GENERIC_LCD=y +CONFIG_FB_ATY_GX=y +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m +CONFIG_FB_SAVAGE=m +CONFIG_FB_SAVAGE_I2C=y +CONFIG_FB_SAVAGE_ACCEL=y +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=m +CONFIG_FB_NEOMAGIC=m +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +CONFIG_FB_3DFX_ACCEL=y +CONFIG_FB_3DFX_I2C=y +CONFIG_FB_VOODOO1=m +CONFIG_FB_VT8623=m +CONFIG_FB_TRIDENT=m +CONFIG_FB_ARK=m +CONFIG_FB_PM3=m +CONFIG_FB_CARMINE=m +CONFIG_FB_CARMINE_DRAM_EVAL=y +# CONFIG_CARMINE_DRAM_CUSTOM is not set +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_LX=m +CONFIG_FB_GEODE_GX=m +CONFIG_FB_GEODE_GX1=m +CONFIG_FB_TMIO=m +CONFIG_FB_TMIO_ACCELL=y +CONFIG_FB_SM501=m +# CONFIG_FB_VIRTUAL is not set +CONFIG_XEN_FBDEV_FRONTEND=m +CONFIG_FB_METRONOME=m +CONFIG_FB_MB862XX=m +# CONFIG_FB_MB862XX_PCI_GDC is not set +CONFIG_FB_BROADSHEET=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_L4F00242T03=m +CONFIG_LCD_LMS283GF05=m +CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m +CONFIG_LCD_VGG2432A4=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_GENERIC=m +CONFIG_BACKLIGHT_PROGEAR=m +CONFIG_BACKLIGHT_CARILLO_RANCH=m +CONFIG_BACKLIGHT_MBP_NVIDIA=m +CONFIG_BACKLIGHT_SAHARA=m + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=m + +# +# Display hardware drivers +# + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_MDA_CONSOLE=m +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=m +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +# CONFIG_SND_SUPPORT_OLD_API is not set +# CONFIG_SND_VERBOSE_PROCFS is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +CONFIG_SND_OPL4_LIB_SEQ=m +CONFIG_SND_SBAWE_SEQ=m +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_OPL4_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +CONFIG_SND_PCSP=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_WSS_LIB=m +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB8_DSP=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_ISA=y +CONFIG_SND_ADLIB=m +CONFIG_SND_AD1816A=m +CONFIG_SND_AD1848=m +CONFIG_SND_ALS100=m +CONFIG_SND_AZT2320=m +CONFIG_SND_CMI8330=m +CONFIG_SND_CS4231=m +CONFIG_SND_CS4236=m +CONFIG_SND_ES968=m +CONFIG_SND_ES1688=m +CONFIG_SND_ES18XX=m +CONFIG_SND_SC6000=m +CONFIG_SND_GUSCLASSIC=m +CONFIG_SND_GUSEXTREME=m +CONFIG_SND_GUSMAX=m +CONFIG_SND_INTERWAVE=m +CONFIG_SND_INTERWAVE_STB=m +CONFIG_SND_JAZZ16=m +CONFIG_SND_OPL3SA2=m +CONFIG_SND_OPTI92X_AD1848=m +CONFIG_SND_OPTI92X_CS4231=m +CONFIG_SND_OPTI93X=m +CONFIG_SND_MIRO=m +CONFIG_SND_SB8=m +CONFIG_SND_SB16=m +CONFIG_SND_SBAWE=m +CONFIG_SND_SB16_CSP=y +CONFIG_SND_SGALAXY=m +CONFIG_SND_SSCAPE=m +CONFIG_SND_WAVEFRONT=m +CONFIG_SND_MSND_PINNACLE=m +CONFIG_SND_MSND_CLASSIC=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AW2=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +# CONFIG_SND_FM801_TEA575X_BOOL is not set +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=1 +CONFIG_SND_HDA_INPUT_JACK=y +# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_NVHDMI=y +CONFIG_SND_HDA_CODEC_INTELHDMI=y +CONFIG_SND_HDA_ELD=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_HIFIER=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SIS7019=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +# CONFIG_SND_USB_CAIAQ_INPUT is not set +CONFIG_SND_USB_US122L=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_I2C_AND_SPI=m +CONFIG_SND_SOC_ALL_CODECS=m +CONFIG_SND_SOC_WM_HUBS=m +CONFIG_SND_SOC_AD1836=m +CONFIG_SND_SOC_AD1938=m +CONFIG_SND_SOC_AD73311=m +CONFIG_SND_SOC_ADS117X=m +CONFIG_SND_SOC_AK4104=m +CONFIG_SND_SOC_AK4535=m +CONFIG_SND_SOC_AK4642=m +CONFIG_SND_SOC_AK4671=m +CONFIG_SND_SOC_CS4270=m +CONFIG_SND_SOC_DA7210=m +CONFIG_SND_SOC_L3=m +CONFIG_SND_SOC_PCM3008=m +CONFIG_SND_SOC_SPDIF=m +CONFIG_SND_SOC_SSM2602=m +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC26=m +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TLV320DAC33=m +CONFIG_SND_SOC_UDA134X=m +CONFIG_SND_SOC_UDA1380=m +CONFIG_SND_SOC_WM8400=m +CONFIG_SND_SOC_WM8510=m +CONFIG_SND_SOC_WM8523=m +CONFIG_SND_SOC_WM8580=m +CONFIG_SND_SOC_WM8711=m +CONFIG_SND_SOC_WM8727=m +CONFIG_SND_SOC_WM8728=m +CONFIG_SND_SOC_WM8731=m +CONFIG_SND_SOC_WM8750=m +CONFIG_SND_SOC_WM8753=m +CONFIG_SND_SOC_WM8776=m +CONFIG_SND_SOC_WM8900=m +CONFIG_SND_SOC_WM8903=m +CONFIG_SND_SOC_WM8904=m +CONFIG_SND_SOC_WM8940=m +CONFIG_SND_SOC_WM8955=m +CONFIG_SND_SOC_WM8960=m +CONFIG_SND_SOC_WM8961=m +CONFIG_SND_SOC_WM8971=m +CONFIG_SND_SOC_WM8974=m +CONFIG_SND_SOC_WM8978=m +CONFIG_SND_SOC_WM8988=m +CONFIG_SND_SOC_WM8990=m +CONFIG_SND_SOC_WM8993=m +CONFIG_SND_SOC_WM8994=m +CONFIG_SND_SOC_WM9081=m +CONFIG_SND_SOC_MAX9877=m +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_WM2000=m +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +CONFIG_HIDRAW=y + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m + +# +# Special HID drivers +# +CONFIG_HID_3M_PCT=m +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LOGITECH is not set +CONFIG_HID_MAGICMOUSE=m +# CONFIG_HID_MICROSOFT is not set +CONFIG_HID_MOSART=m +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_NTRIG is not set +CONFIG_HID_ORTEK=m +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +CONFIG_HID_QUANTA=m +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +CONFIG_HID_STANTUM=m +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_ZEROPLUS is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=m +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_C67X00_HCD=m +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=m +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m +CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_SSB=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m +CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m + +# +# Enable Host or Gadget support to see Inventra options +# + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_LIBUSUAL=y + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +CONFIG_USB_RIO500=m +# CONFIG_USB_LEGOTOWER is not set +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +# CONFIG_USB_APPLEDISPLAY is not set +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +# CONFIG_USB_TRANCEVIBRATOR is not set +CONFIG_USB_IOWARRIOR=m +CONFIG_USB_TEST=m +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +CONFIG_USB_GPIO_VBUS=m +CONFIG_NOP_USB_XCEIV=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_WLP=m +CONFIG_UWB_I1480U=m +CONFIG_UWB_I1480U_WLP=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +CONFIG_MMC_TEST=m + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +# CONFIG_MMC_RICOH_MMC is not set +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m + +# +# LED drivers +# +CONFIG_LEDS_NET48XX=m +CONFIG_LEDS_WRAP=m +CONFIG_LEDS_ALIX2=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO_PLATFORM=y +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_ACCESSIBILITY=y +# CONFIG_A11Y_BRAILLE_CONSOLE is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_MLX4_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB_CM is not set +# CONFIG_INFINIBAND_IPOIB_DEBUG is not set +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_ISER=m +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=m +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_TEST=m + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m + +# +# SPI RTC drivers +# +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_DS3234=m +CONFIG_RTC_DRV_PCF2123=m + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y +CONFIG_INTEL_IOATDMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +# CONFIG_ASYNC_TX_DMA is not set +CONFIG_DMATEST=m +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +CONFIG_UIO_PDRV=m +CONFIG_UIO_PDRV_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +# CONFIG_UIO_PCI_GENERIC is not set +CONFIG_UIO_NETX=m + +# +# TI VLYNQ +# + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=y +CONFIG_XENFS=y +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +# CONFIG_STAGING is not set +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_TC1100_WMI=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +# CONFIG_SONYPI_COMPAT is not set +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_ACPI_ASUS=m +# CONFIG_TOPSTAR_LAPTOP is not set +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +# CONFIG_ISCSI_IBFT_FIND is not set + +# +# File systems +# +CONFIG_EXT2_FS=m +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT2_FS_XIP=y +CONFIG_EXT3_FS=m +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_FS_XIP=y +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +# CONFIG_REISERFS_FS_SECURITY is not set +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +CONFIG_OCFS2_FS_STATS=y +CONFIG_OCFS2_DEBUG_MASKLOG=y +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_NILFS2_FS=m +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +# CONFIG_DNOTIFY is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=m +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m +# CONFIG_CUSE is not set + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +# CONFIG_PROC_KCORE is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +CONFIG_EFS_FS=m +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_RUBIN=y +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set +CONFIG_UBIFS_FS=m +# CONFIG_UBIFS_FS_XATTR is not set +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_UBIFS_FS_DEBUG is not set +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +CONFIG_OMFS_FS=m +CONFIG_HPFS_FS=m +# CONFIG_QNX4FS_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +# CONFIG_NFS_FSCACHE is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +CONFIG_CEPH_FS=m +# CONFIG_CEPH_FS_PRETTYDEBUG is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_EXPERIMENTAL=y +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +# CONFIG_DLM_DEBUG is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +CONFIG_LKDTM=m +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_RING_BUFFER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_STRICT_DEVMEM=y +# CONFIG_X86_VERBOSE_BOOTUP is not set +# CONFIG_EARLY_PRINTK is not set +# CONFIG_4KSTACKS is not set +# CONFIG_DOUBLEFAULT is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_OPTIMIZE_INLINING is not set + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +# CONFIG_SECURITY_NETWORK is not set +# CONFIG_SECURITY_PATH is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_IMA is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_586=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_VHOST_NET=m +CONFIG_LGUEST=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=m +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=m +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_NLATTR=y +CONFIG_LRU_CACHE=m diff --git a/testing/linux-scst/put_page_callback-2.6.34.patch b/testing/linux-scst/put_page_callback-2.6.34.patch new file mode 100644 index 0000000000..97d6f7f0af --- /dev/null +++ b/testing/linux-scst/put_page_callback-2.6.34.patch @@ -0,0 +1,390 @@ +diff -upkr linux-2.6.34/include/linux/mm_types.h linux-2.6.34/include/linux/mm_types.h +--- linux-2.6.34/include/linux/mm_types.h 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/include/linux/mm_types.h 2010-05-24 14:51:40.000000000 +0400 +@@ -100,6 +100,18 @@ struct page { + */ + void *shadow; + #endif ++ ++#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) ++ /* ++ * Used to implement support for notification on zero-copy TCP transfer ++ * completion. It might look as not good to have this field here and ++ * it's better to have it in struct sk_buff, but it would make the code ++ * much more complicated and fragile, since all skb then would have to ++ * contain only pages with the same value in this field. ++ */ ++ void *net_priv; ++#endif ++ + }; + + /* +diff -upkr linux-2.6.34/include/linux/net.h linux-2.6.34/include/linux/net.h +--- linux-2.6.34/include/linux/net.h 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/include/linux/net.h 2010-05-24 14:51:40.000000000 +0400 +@@ -20,6 +20,7 @@ + + #include + #include ++#include + + #define NPROTO AF_MAX + +@@ -288,5 +289,44 @@ extern int kernel_sock_shutdown(struct s + extern struct ratelimit_state net_ratelimit_state; + #endif + ++#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) ++/* Support for notification on zero-copy TCP transfer completion */ ++typedef void (*net_get_page_callback_t)(struct page *page); ++typedef void (*net_put_page_callback_t)(struct page *page); ++ ++extern net_get_page_callback_t net_get_page_callback; ++extern net_put_page_callback_t net_put_page_callback; ++ ++extern int net_set_get_put_page_callbacks( ++ net_get_page_callback_t get_callback, ++ net_put_page_callback_t put_callback); ++ ++/* ++ * See comment for net_set_get_put_page_callbacks() why those functions ++ * don't need any protection. ++ */ ++static inline void net_get_page(struct page *page) ++{ ++ if (page->net_priv != 0) ++ net_get_page_callback(page); ++ get_page(page); ++} ++static inline void net_put_page(struct page *page) ++{ ++ if (page->net_priv != 0) ++ net_put_page_callback(page); ++ put_page(page); ++} ++#else ++static inline void net_get_page(struct page *page) ++{ ++ get_page(page); ++} ++static inline void net_put_page(struct page *page) ++{ ++ put_page(page); ++} ++#endif /* CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION */ ++ + #endif /* __KERNEL__ */ + #endif /* _LINUX_NET_H */ +diff -upkr linux-2.6.34/net/core/dev.c linux-2.6.34/net/core/dev.c +--- linux-2.6.34/net/core/dev.c 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/net/core/dev.c 2010-05-24 14:51:40.000000000 +0400 +@@ -2732,7 +2732,7 @@ pull: + skb_shinfo(skb)->frags[0].size -= grow; + + if (unlikely(!skb_shinfo(skb)->frags[0].size)) { +- put_page(skb_shinfo(skb)->frags[0].page); ++ net_put_page(skb_shinfo(skb)->frags[0].page); + memmove(skb_shinfo(skb)->frags, + skb_shinfo(skb)->frags + 1, + --skb_shinfo(skb)->nr_frags); +diff -upkr linux-2.6.34/net/core/skbuff.c linux-2.6.34/net/core/skbuff.c +--- linux-2.6.34/net/core/skbuff.c 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/net/core/skbuff.c 2010-05-24 14:51:40.000000000 +0400 +@@ -76,13 +76,13 @@ static struct kmem_cache *skbuff_fclone_ + static void sock_pipe_buf_release(struct pipe_inode_info *pipe, + struct pipe_buffer *buf) + { +- put_page(buf->page); ++ net_put_page(buf->page); + } + + static void sock_pipe_buf_get(struct pipe_inode_info *pipe, + struct pipe_buffer *buf) + { +- get_page(buf->page); ++ net_get_page(buf->page); + } + + static int sock_pipe_buf_steal(struct pipe_inode_info *pipe, +@@ -344,7 +344,7 @@ static void skb_release_data(struct sk_b + if (skb_shinfo(skb)->nr_frags) { + int i; + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) +- put_page(skb_shinfo(skb)->frags[i].page); ++ net_put_page(skb_shinfo(skb)->frags[i].page); + } + + if (skb_has_frags(skb)) +@@ -765,7 +765,7 @@ struct sk_buff *pskb_copy(struct sk_buff + + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + skb_shinfo(n)->frags[i] = skb_shinfo(skb)->frags[i]; +- get_page(skb_shinfo(n)->frags[i].page); ++ net_get_page(skb_shinfo(n)->frags[i].page); + } + skb_shinfo(n)->nr_frags = i; + } +@@ -831,7 +831,7 @@ int pskb_expand_head(struct sk_buff *skb + sizeof(struct skb_shared_info)); + + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) +- get_page(skb_shinfo(skb)->frags[i].page); ++ net_get_page(skb_shinfo(skb)->frags[i].page); + + if (skb_has_frags(skb)) + skb_clone_fraglist(skb); +@@ -1105,7 +1105,7 @@ drop_pages: + skb_shinfo(skb)->nr_frags = i; + + for (; i < nfrags; i++) +- put_page(skb_shinfo(skb)->frags[i].page); ++ net_put_page(skb_shinfo(skb)->frags[i].page); + + if (skb_has_frags(skb)) + skb_drop_fraglist(skb); +@@ -1274,7 +1274,7 @@ pull_pages: + k = 0; + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + if (skb_shinfo(skb)->frags[i].size <= eat) { +- put_page(skb_shinfo(skb)->frags[i].page); ++ net_put_page(skb_shinfo(skb)->frags[i].page); + eat -= skb_shinfo(skb)->frags[i].size; + } else { + skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i]; +@@ -1375,7 +1375,7 @@ EXPORT_SYMBOL(skb_copy_bits); + */ + static void sock_spd_release(struct splice_pipe_desc *spd, unsigned int i) + { +- put_page(spd->pages[i]); ++ net_put_page(spd->pages[i]); + } + + static inline struct page *linear_to_page(struct page *page, unsigned int *len, +@@ -1399,7 +1399,7 @@ new_page: + off = sk->sk_sndmsg_off; + mlen = PAGE_SIZE - off; + if (mlen < 64 && mlen < *len) { +- put_page(p); ++ net_put_page(p); + goto new_page; + } + +@@ -1409,7 +1409,7 @@ new_page: + memcpy(page_address(p) + off, page_address(page) + *offset, *len); + sk->sk_sndmsg_off += *len; + *offset = off; +- get_page(p); ++ net_get_page(p); + + return p; + } +@@ -1430,7 +1430,7 @@ static inline int spd_fill_page(struct s + if (!page) + return 1; + } else +- get_page(page); ++ net_get_page(page); + + spd->pages[spd->nr_pages] = page; + spd->partial[spd->nr_pages].len = *len; +@@ -2060,7 +2060,7 @@ static inline void skb_split_no_header(s + * where splitting is expensive. + * 2. Split is accurately. We make this. + */ +- get_page(skb_shinfo(skb)->frags[i].page); ++ net_get_page(skb_shinfo(skb)->frags[i].page); + skb_shinfo(skb1)->frags[0].page_offset += len - pos; + skb_shinfo(skb1)->frags[0].size -= len - pos; + skb_shinfo(skb)->frags[i].size = len - pos; +@@ -2182,7 +2182,7 @@ int skb_shift(struct sk_buff *tgt, struc + to++; + + } else { +- get_page(fragfrom->page); ++ net_get_page(fragfrom->page); + fragto->page = fragfrom->page; + fragto->page_offset = fragfrom->page_offset; + fragto->size = todo; +@@ -2204,7 +2204,7 @@ int skb_shift(struct sk_buff *tgt, struc + fragto = &skb_shinfo(tgt)->frags[merge]; + + fragto->size += fragfrom->size; +- put_page(fragfrom->page); ++ net_put_page(fragfrom->page); + } + + /* Reposition in the original skb */ +@@ -2602,7 +2602,7 @@ struct sk_buff *skb_segment(struct sk_bu + + while (pos < offset + len && i < nfrags) { + *frag = skb_shinfo(skb)->frags[i]; +- get_page(frag->page); ++ net_get_page(frag->page); + size = frag->size; + + if (pos < offset) { +diff -upkr linux-2.6.34/net/ipv4/ip_output.c linux-2.6.34/net/ipv4/ip_output.c +--- linux-2.6.34/net/ipv4/ip_output.c 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/net/ipv4/ip_output.c 2010-05-24 14:51:40.000000000 +0400 +@@ -1024,7 +1024,7 @@ alloc_new_skb: + err = -EMSGSIZE; + goto error; + } +- get_page(page); ++ net_get_page(page); + skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0); + frag = &skb_shinfo(skb)->frags[i]; + } +@@ -1182,7 +1182,7 @@ ssize_t ip_append_page(struct sock *sk, + if (skb_can_coalesce(skb, i, page, offset)) { + skb_shinfo(skb)->frags[i-1].size += len; + } else if (i < MAX_SKB_FRAGS) { +- get_page(page); ++ net_get_page(page); + skb_fill_page_desc(skb, i, page, offset, len); + } else { + err = -EMSGSIZE; +diff -upkr linux-2.6.34/net/ipv4/Makefile linux-2.6.34/net/ipv4/Makefile +--- linux-2.6.34/net/ipv4/Makefile 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/net/ipv4/Makefile 2010-05-24 14:51:40.000000000 +0400 +@@ -49,6 +49,7 @@ obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o + obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o + obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o + obj-$(CONFIG_NETLABEL) += cipso_ipv4.o ++obj-$(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) += tcp_zero_copy.o + + obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \ + xfrm4_output.o +diff -upkr linux-2.6.34/net/ipv4/tcp.c linux-2.6.34/net/ipv4/tcp.c +--- linux-2.6.34/net/ipv4/tcp.c 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/net/ipv4/tcp.c 2010-05-24 14:51:40.000000000 +0400 +@@ -800,7 +800,7 @@ new_segment: + if (can_coalesce) { + skb_shinfo(skb)->frags[i - 1].size += copy; + } else { +- get_page(page); ++ net_get_page(page); + skb_fill_page_desc(skb, i, page, offset, copy); + } + +@@ -1009,7 +1009,7 @@ new_segment: + goto new_segment; + } else if (page) { + if (off == PAGE_SIZE) { +- put_page(page); ++ net_put_page(page); + TCP_PAGE(sk) = page = NULL; + off = 0; + } +@@ -1050,9 +1050,9 @@ new_segment: + } else { + skb_fill_page_desc(skb, i, page, off, copy); + if (TCP_PAGE(sk)) { +- get_page(page); ++ net_get_page(page); + } else if (off + copy < PAGE_SIZE) { +- get_page(page); ++ net_get_page(page); + TCP_PAGE(sk) = page; + } + } +diff -upkr linux-2.6.34/net/ipv4/tcp_output.c linux-2.6.34/net/ipv4/tcp_output.c +--- linux-2.6.34/net/ipv4/tcp_output.c 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/net/ipv4/tcp_output.c 2010-05-24 14:51:40.000000000 +0400 +@@ -1084,7 +1084,7 @@ static void __pskb_trim_head(struct sk_b + k = 0; + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + if (skb_shinfo(skb)->frags[i].size <= eat) { +- put_page(skb_shinfo(skb)->frags[i].page); ++ net_put_page(skb_shinfo(skb)->frags[i].page); + eat -= skb_shinfo(skb)->frags[i].size; + } else { + skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i]; +diff -upkr linux-2.6.34/net/ipv4/tcp_zero_copy.c linux-2.6.34/net/ipv4/tcp_zero_copy.c +--- linux-2.6.34/net/ipv4/tcp_zero_copy.c 2010-03-01 17:30:31.000000000 +0300 ++++ linux-2.6.34/net/ipv4/tcp_zero_copy.c 2010-05-24 14:51:40.000000000 +0400 +@@ -0,0 +1,49 @@ ++/* ++ * Support routines for TCP zero copy transmit ++ * ++ * Created by Vladislav Bolkhovitin ++ * ++ * 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. ++ */ ++ ++#include ++ ++net_get_page_callback_t net_get_page_callback __read_mostly; ++EXPORT_SYMBOL(net_get_page_callback); ++ ++net_put_page_callback_t net_put_page_callback __read_mostly; ++EXPORT_SYMBOL(net_put_page_callback); ++ ++/* ++ * Caller of this function must ensure that at the moment when it's called ++ * there are no pages in the system with net_priv field set to non-zero ++ * value. Hence, this function, as well as net_get_page() and net_put_page(), ++ * don't need any protection. ++ */ ++int net_set_get_put_page_callbacks( ++ net_get_page_callback_t get_callback, ++ net_put_page_callback_t put_callback) ++{ ++ int res = 0; ++ ++ if ((net_get_page_callback != NULL) && (get_callback != NULL) && ++ (net_get_page_callback != get_callback)) { ++ res = -EBUSY; ++ goto out; ++ } ++ ++ if ((net_put_page_callback != NULL) && (put_callback != NULL) && ++ (net_put_page_callback != put_callback)) { ++ res = -EBUSY; ++ goto out; ++ } ++ ++ net_get_page_callback = get_callback; ++ net_put_page_callback = put_callback; ++ ++out: ++ return res; ++} ++EXPORT_SYMBOL(net_set_get_put_page_callbacks); +diff -upkr linux-2.6.34/net/ipv6/ip6_output.c linux-2.6.34/net/ipv6/ip6_output.c +--- linux-2.6.34/net/ipv6/ip6_output.c 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/net/ipv6/ip6_output.c 2010-05-24 14:51:40.000000000 +0400 +@@ -1382,7 +1382,7 @@ alloc_new_skb: + err = -EMSGSIZE; + goto error; + } +- get_page(page); ++ net_get_page(page); + skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0); + frag = &skb_shinfo(skb)->frags[i]; + } +diff -upkr linux-2.6.34/net/Kconfig linux-2.6.34/net/Kconfig +--- linux-2.6.34/net/Kconfig 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/net/Kconfig 2010-05-24 14:51:40.000000000 +0400 +@@ -72,6 +72,18 @@ config INET + + Short answer: say Y. + ++config TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION ++ bool "TCP/IP zero-copy transfer completion notification" ++ depends on INET ++ default SCST_ISCSI ++ ---help--- ++ Adds support for sending a notification upon completion of a ++ zero-copy TCP/IP transfer. This can speed up certain TCP/IP ++ software. Currently this is only used by the iSCSI target driver ++ iSCSI-SCST. ++ ++ If unsure, say N. ++ + if INET + source "net/ipv4/Kconfig" + source "net/ipv6/Kconfig" diff --git a/testing/linux-scst/scst_exec_req_fifo-2.6.34.patch b/testing/linux-scst/scst_exec_req_fifo-2.6.34.patch new file mode 100644 index 0000000000..3a734bb645 --- /dev/null +++ b/testing/linux-scst/scst_exec_req_fifo-2.6.34.patch @@ -0,0 +1,529 @@ +diff -upkr linux-2.6.34/block/blk-map.c linux-2.6.34/block/blk-map.c +--- linux-2.6.34/block/blk-map.c 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/block/blk-map.c 2010-05-24 15:19:49.000000000 +0400 +@@ -5,6 +5,8 @@ + #include + #include + #include ++#include ++#include + #include /* for struct sg_iovec */ + + #include "blk.h" +@@ -271,6 +273,336 @@ int blk_rq_unmap_user(struct bio *bio) + } + EXPORT_SYMBOL(blk_rq_unmap_user); + ++struct blk_kern_sg_work { ++ atomic_t bios_inflight; ++ struct sg_table sg_table; ++ struct scatterlist *src_sgl; ++}; ++ ++static void blk_free_kern_sg_work(struct blk_kern_sg_work *bw) ++{ ++ sg_free_table(&bw->sg_table); ++ kfree(bw); ++ return; ++} ++ ++static void blk_bio_map_kern_endio(struct bio *bio, int err) ++{ ++ struct blk_kern_sg_work *bw = bio->bi_private; ++ ++ if (bw != NULL) { ++ /* Decrement the bios in processing and, if zero, free */ ++ BUG_ON(atomic_read(&bw->bios_inflight) <= 0); ++ if (atomic_dec_and_test(&bw->bios_inflight)) { ++ if ((bio_data_dir(bio) == READ) && (err == 0)) { ++ unsigned long flags; ++ ++ local_irq_save(flags); /* to protect KMs */ ++ sg_copy(bw->src_sgl, bw->sg_table.sgl, 0, 0, ++ KM_BIO_DST_IRQ, KM_BIO_SRC_IRQ); ++ local_irq_restore(flags); ++ } ++ blk_free_kern_sg_work(bw); ++ } ++ } ++ ++ bio_put(bio); ++ return; ++} ++ ++static int blk_rq_copy_kern_sg(struct request *rq, struct scatterlist *sgl, ++ int nents, struct blk_kern_sg_work **pbw, ++ gfp_t gfp, gfp_t page_gfp) ++{ ++ int res = 0, i; ++ struct scatterlist *sg; ++ struct scatterlist *new_sgl; ++ int new_sgl_nents; ++ size_t len = 0, to_copy; ++ struct blk_kern_sg_work *bw; ++ ++ bw = kzalloc(sizeof(*bw), gfp); ++ if (bw == NULL) ++ goto out; ++ ++ bw->src_sgl = sgl; ++ ++ for_each_sg(sgl, sg, nents, i) ++ len += sg->length; ++ to_copy = len; ++ ++ new_sgl_nents = PFN_UP(len); ++ ++ res = sg_alloc_table(&bw->sg_table, new_sgl_nents, gfp); ++ if (res != 0) ++ goto out_free_bw; ++ ++ new_sgl = bw->sg_table.sgl; ++ ++ for_each_sg(new_sgl, sg, new_sgl_nents, i) { ++ struct page *pg; ++ ++ pg = alloc_page(page_gfp); ++ if (pg == NULL) ++ goto err_free_new_sgl; ++ ++ sg_assign_page(sg, pg); ++ sg->length = min_t(size_t, PAGE_SIZE, len); ++ ++ len -= PAGE_SIZE; ++ } ++ ++ if (rq_data_dir(rq) == WRITE) { ++ /* ++ * We need to limit amount of copied data to to_copy, because ++ * sgl might have the last element in sgl not marked as last in ++ * SG chaining. ++ */ ++ sg_copy(new_sgl, sgl, 0, to_copy, ++ KM_USER0, KM_USER1); ++ } ++ ++ *pbw = bw; ++ /* ++ * REQ_COPY_USER name is misleading. It should be something like ++ * REQ_HAS_TAIL_SPACE_FOR_PADDING. ++ */ ++ rq->cmd_flags |= REQ_COPY_USER; ++ ++out: ++ return res; ++ ++err_free_new_sgl: ++ for_each_sg(new_sgl, sg, new_sgl_nents, i) { ++ struct page *pg = sg_page(sg); ++ if (pg == NULL) ++ break; ++ __free_page(pg); ++ } ++ sg_free_table(&bw->sg_table); ++ ++out_free_bw: ++ kfree(bw); ++ res = -ENOMEM; ++ goto out; ++} ++ ++static int __blk_rq_map_kern_sg(struct request *rq, struct scatterlist *sgl, ++ int nents, struct blk_kern_sg_work *bw, gfp_t gfp) ++{ ++ int res; ++ struct request_queue *q = rq->q; ++ int rw = rq_data_dir(rq); ++ int max_nr_vecs, i; ++ size_t tot_len; ++ bool need_new_bio; ++ struct scatterlist *sg, *prev_sg = NULL; ++ struct bio *bio = NULL, *hbio = NULL, *tbio = NULL; ++ int bios; ++ ++ if (unlikely((sgl == NULL) || (sgl->length == 0) || (nents <= 0))) { ++ WARN_ON(1); ++ res = -EINVAL; ++ goto out; ++ } ++ ++ /* ++ * Let's keep each bio allocation inside a single page to decrease ++ * probability of failure. ++ */ ++ max_nr_vecs = min_t(size_t, ++ ((PAGE_SIZE - sizeof(struct bio)) / sizeof(struct bio_vec)), ++ BIO_MAX_PAGES); ++ ++ need_new_bio = true; ++ tot_len = 0; ++ bios = 0; ++ for_each_sg(sgl, sg, nents, i) { ++ struct page *page = sg_page(sg); ++ void *page_addr = page_address(page); ++ size_t len = sg->length, l; ++ size_t offset = sg->offset; ++ ++ tot_len += len; ++ prev_sg = sg; ++ ++ /* ++ * Each segment must be aligned on DMA boundary and ++ * not on stack. The last one may have unaligned ++ * length as long as the total length is aligned to ++ * DMA padding alignment. ++ */ ++ if (i == nents - 1) ++ l = 0; ++ else ++ l = len; ++ if (((sg->offset | l) & queue_dma_alignment(q)) || ++ (page_addr && object_is_on_stack(page_addr + sg->offset))) { ++ res = -EINVAL; ++ goto out_free_bios; ++ } ++ ++ while (len > 0) { ++ size_t bytes; ++ int rc; ++ ++ if (need_new_bio) { ++ bio = bio_kmalloc(gfp, max_nr_vecs); ++ if (bio == NULL) { ++ res = -ENOMEM; ++ goto out_free_bios; ++ } ++ ++ if (rw == WRITE) ++ bio->bi_rw |= 1 << BIO_RW; ++ ++ bios++; ++ bio->bi_private = bw; ++ bio->bi_end_io = blk_bio_map_kern_endio; ++ ++ if (hbio == NULL) ++ hbio = tbio = bio; ++ else ++ tbio = tbio->bi_next = bio; ++ } ++ ++ bytes = min_t(size_t, len, PAGE_SIZE - offset); ++ ++ rc = bio_add_pc_page(q, bio, page, bytes, offset); ++ if (rc < bytes) { ++ if (unlikely(need_new_bio || (rc < 0))) { ++ if (rc < 0) ++ res = rc; ++ else ++ res = -EIO; ++ goto out_free_bios; ++ } else { ++ need_new_bio = true; ++ len -= rc; ++ offset += rc; ++ continue; ++ } ++ } ++ ++ need_new_bio = false; ++ offset = 0; ++ len -= bytes; ++ page = nth_page(page, 1); ++ } ++ } ++ ++ if (hbio == NULL) { ++ res = -EINVAL; ++ goto out_free_bios; ++ } ++ ++ /* Total length must be aligned on DMA padding alignment */ ++ if ((tot_len & q->dma_pad_mask) && ++ !(rq->cmd_flags & REQ_COPY_USER)) { ++ res = -EINVAL; ++ goto out_free_bios; ++ } ++ ++ if (bw != NULL) ++ atomic_set(&bw->bios_inflight, bios); ++ ++ while (hbio != NULL) { ++ bio = hbio; ++ hbio = hbio->bi_next; ++ bio->bi_next = NULL; ++ ++ blk_queue_bounce(q, &bio); ++ ++ res = blk_rq_append_bio(q, rq, bio); ++ if (unlikely(res != 0)) { ++ bio->bi_next = hbio; ++ hbio = bio; ++ /* We can have one or more bios bounced */ ++ goto out_unmap_bios; ++ } ++ } ++ ++ rq->buffer = NULL; ++out: ++ return res; ++ ++out_free_bios: ++ while (hbio != NULL) { ++ bio = hbio; ++ hbio = hbio->bi_next; ++ bio_put(bio); ++ } ++ goto out; ++ ++out_unmap_bios: ++ blk_rq_unmap_kern_sg(rq, res); ++ goto out; ++} ++ ++/** ++ * blk_rq_map_kern_sg - map kernel data to a request, for REQ_TYPE_BLOCK_PC ++ * @rq: request to fill ++ * @sgl: area to map ++ * @nents: number of elements in @sgl ++ * @gfp: memory allocation flags ++ * ++ * Description: ++ * Data will be mapped directly if possible. Otherwise a bounce ++ * buffer will be used. ++ */ ++int blk_rq_map_kern_sg(struct request *rq, struct scatterlist *sgl, ++ int nents, gfp_t gfp) ++{ ++ int res; ++ ++ res = __blk_rq_map_kern_sg(rq, sgl, nents, NULL, gfp); ++ if (unlikely(res != 0)) { ++ struct blk_kern_sg_work *bw = NULL; ++ ++ res = blk_rq_copy_kern_sg(rq, sgl, nents, &bw, ++ gfp, rq->q->bounce_gfp | gfp); ++ if (unlikely(res != 0)) ++ goto out; ++ ++ res = __blk_rq_map_kern_sg(rq, bw->sg_table.sgl, ++ bw->sg_table.nents, bw, gfp); ++ if (res != 0) { ++ blk_free_kern_sg_work(bw); ++ goto out; ++ } ++ } ++ ++ rq->buffer = NULL; ++ ++out: ++ return res; ++} ++EXPORT_SYMBOL(blk_rq_map_kern_sg); ++ ++/** ++ * blk_rq_unmap_kern_sg - unmap a request with kernel sg ++ * @rq: request to unmap ++ * @err: non-zero error code ++ * ++ * Description: ++ * Unmap a rq previously mapped by blk_rq_map_kern_sg(). Must be called ++ * only in case of an error! ++ */ ++void blk_rq_unmap_kern_sg(struct request *rq, int err) ++{ ++ struct bio *bio = rq->bio; ++ ++ while (bio) { ++ struct bio *b = bio; ++ bio = bio->bi_next; ++ b->bi_end_io(b, err); ++ } ++ rq->bio = NULL; ++ ++ return; ++} ++EXPORT_SYMBOL(blk_rq_unmap_kern_sg); ++ + /** + * blk_rq_map_kern - map kernel data to a request, for REQ_TYPE_BLOCK_PC usage + * @q: request queue where request should be inserted +diff -upkr linux-2.6.34/include/linux/blkdev.h linux-2.6.34/include/linux/blkdev.h +--- linux-2.6.34/include/linux/blkdev.h 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/include/linux/blkdev.h 2010-05-24 14:51:22.000000000 +0400 +@@ -713,6 +713,8 @@ extern unsigned long blk_max_low_pfn, bl + #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) + #define BLK_MIN_SG_TIMEOUT (7 * HZ) + ++#define SCSI_EXEC_REQ_FIFO_DEFINED ++ + #ifdef CONFIG_BOUNCE + extern int init_emergency_isa_pool(void); + extern void blk_queue_bounce(struct request_queue *q, struct bio **bio); +@@ -828,6 +830,9 @@ extern int blk_rq_map_kern(struct reques + extern int blk_rq_map_user_iov(struct request_queue *, struct request *, + struct rq_map_data *, struct sg_iovec *, int, + unsigned int, gfp_t); ++extern int blk_rq_map_kern_sg(struct request *rq, struct scatterlist *sgl, ++ int nents, gfp_t gfp); ++extern void blk_rq_unmap_kern_sg(struct request *rq, int err); + extern int blk_execute_rq(struct request_queue *, struct gendisk *, + struct request *, int); + extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *, +diff -upkr linux-2.6.34/include/linux/scatterlist.h linux-2.6.34/include/linux/scatterlist.h +--- linux-2.6.34/include/linux/scatterlist.h 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/include/linux/scatterlist.h 2010-05-24 14:51:22.000000000 +0400 +@@ -3,6 +3,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -218,6 +219,10 @@ size_t sg_copy_from_buffer(struct scatte + size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents, + void *buf, size_t buflen); + ++int sg_copy(struct scatterlist *dst_sg, struct scatterlist *src_sg, ++ int nents_to_copy, size_t copy_len, ++ enum km_type d_km_type, enum km_type s_km_type); ++ + /* + * Maximum number of entries that will be allocated in one piece, if + * a list larger than this is required then chaining will be utilized. +diff -upkr linux-2.6.34/lib/scatterlist.c linux-2.6.34/lib/scatterlist.c +--- linux-2.6.34/lib/scatterlist.c 2010-05-17 01:17:36.000000000 +0400 ++++ linux-2.6.34/lib/scatterlist.c 2010-05-24 14:51:22.000000000 +0400 +@@ -494,3 +494,132 @@ size_t sg_copy_to_buffer(struct scatterl + return sg_copy_buffer(sgl, nents, buf, buflen, 1); + } + EXPORT_SYMBOL(sg_copy_to_buffer); ++ ++/* ++ * Can switch to the next dst_sg element, so, to copy to strictly only ++ * one dst_sg element, it must be either last in the chain, or ++ * copy_len == dst_sg->length. ++ */ ++static int sg_copy_elem(struct scatterlist **pdst_sg, size_t *pdst_len, ++ size_t *pdst_offs, struct scatterlist *src_sg, ++ size_t copy_len, ++ enum km_type d_km_type, enum km_type s_km_type) ++{ ++ int res = 0; ++ struct scatterlist *dst_sg; ++ size_t src_len, dst_len, src_offs, dst_offs; ++ struct page *src_page, *dst_page; ++ ++ dst_sg = *pdst_sg; ++ dst_len = *pdst_len; ++ dst_offs = *pdst_offs; ++ dst_page = sg_page(dst_sg); ++ ++ src_page = sg_page(src_sg); ++ src_len = src_sg->length; ++ src_offs = src_sg->offset; ++ ++ do { ++ void *saddr, *daddr; ++ size_t n; ++ ++ saddr = kmap_atomic(src_page + ++ (src_offs >> PAGE_SHIFT), s_km_type) + ++ (src_offs & ~PAGE_MASK); ++ daddr = kmap_atomic(dst_page + ++ (dst_offs >> PAGE_SHIFT), d_km_type) + ++ (dst_offs & ~PAGE_MASK); ++ ++ if (((src_offs & ~PAGE_MASK) == 0) && ++ ((dst_offs & ~PAGE_MASK) == 0) && ++ (src_len >= PAGE_SIZE) && (dst_len >= PAGE_SIZE) && ++ (copy_len >= PAGE_SIZE)) { ++ copy_page(daddr, saddr); ++ n = PAGE_SIZE; ++ } else { ++ n = min_t(size_t, PAGE_SIZE - (dst_offs & ~PAGE_MASK), ++ PAGE_SIZE - (src_offs & ~PAGE_MASK)); ++ n = min(n, src_len); ++ n = min(n, dst_len); ++ n = min_t(size_t, n, copy_len); ++ memcpy(daddr, saddr, n); ++ } ++ dst_offs += n; ++ src_offs += n; ++ ++ kunmap_atomic(saddr, s_km_type); ++ kunmap_atomic(daddr, d_km_type); ++ ++ res += n; ++ copy_len -= n; ++ if (copy_len == 0) ++ goto out; ++ ++ src_len -= n; ++ dst_len -= n; ++ if (dst_len == 0) { ++ dst_sg = sg_next(dst_sg); ++ if (dst_sg == NULL) ++ goto out; ++ dst_page = sg_page(dst_sg); ++ dst_len = dst_sg->length; ++ dst_offs = dst_sg->offset; ++ } ++ } while (src_len > 0); ++ ++out: ++ *pdst_sg = dst_sg; ++ *pdst_len = dst_len; ++ *pdst_offs = dst_offs; ++ return res; ++} ++ ++/** ++ * sg_copy - copy one SG vector to another ++ * @dst_sg: destination SG ++ * @src_sg: source SG ++ * @nents_to_copy: maximum number of entries to copy ++ * @copy_len: maximum amount of data to copy. If 0, then copy all. ++ * @d_km_type: kmap_atomic type for the destination SG ++ * @s_km_type: kmap_atomic type for the source SG ++ * ++ * Description: ++ * Data from the source SG vector will be copied to the destination SG ++ * vector. End of the vectors will be determined by sg_next() returning ++ * NULL. Returns number of bytes copied. ++ */ ++int sg_copy(struct scatterlist *dst_sg, struct scatterlist *src_sg, ++ int nents_to_copy, size_t copy_len, ++ enum km_type d_km_type, enum km_type s_km_type) ++{ ++ int res = 0; ++ size_t dst_len, dst_offs; ++ ++ if (copy_len == 0) ++ copy_len = 0x7FFFFFFF; /* copy all */ ++ ++ if (nents_to_copy == 0) ++ nents_to_copy = 0x7FFFFFFF; /* copy all */ ++ ++ dst_len = dst_sg->length; ++ dst_offs = dst_sg->offset; ++ ++ do { ++ int copied = sg_copy_elem(&dst_sg, &dst_len, &dst_offs, ++ src_sg, copy_len, d_km_type, s_km_type); ++ copy_len -= copied; ++ res += copied; ++ if ((copy_len == 0) || (dst_sg == NULL)) ++ goto out; ++ ++ nents_to_copy--; ++ if (nents_to_copy == 0) ++ goto out; ++ ++ src_sg = sg_next(src_sg); ++ } while (src_sg != NULL); ++ ++out: ++ return res; ++} ++EXPORT_SYMBOL(sg_copy); diff --git a/testing/scst-svn-scst/APKBUILD b/testing/scst-svn-scst/APKBUILD new file mode 100644 index 0000000000..b7cda1ad71 --- /dev/null +++ b/testing/scst-svn-scst/APKBUILD @@ -0,0 +1,82 @@ +# Contributor: Carlo Landmeter +# Maintainer: Natanael Copa + +_flavor=${FLAVOR:-scst} +_realname=scst-svn +# source the kernel version +if [ -f ../../testing/linux-$_flavor/APKBUILD ]; then + . ../../testing/linux-$_flavor/APKBUILD +fi +_kver=$pkgver +_kernelver=$pkgver-r$pkgrel +_abi_release=$pkgver-${_flavor} +_kpkgrel=$pkgrel + +# We need to build iscsi together with scst because it needs some files from its builddir +_iscsiname=iscsi-scst-svn +_iscsidir="$srcdir"/iscsi-scst + +_realver=1713 +pkgname=${_realname}-${_flavor} +pkgver=$_kver +_mypkgrel=0 +pkgrel=$(($_kpkgrel + $_mypkgrel)) +pkgdesc="$_flavor kernel modules for SCST $_realver" +url="http://scst.sourceforge.net/" +license="GPL-2" +depends="linux-${_flavor}=${_kernelver}" +install= +makedepends="linux-${_flavor}-dev=${_kernelver} sed bash" +subpackages="$pkgname-dev $_iscsiname-scst:iscsi" +source="http://alpine.nethq.org/clandmeter/src/$_realname-$_realver.tar.gz + http://alpine.nethq.org/clandmeter/src/$_iscsiname-$_realver.tar.gz" + +_ksrc=/usr/src/linux-headers-${_abi_release} + +_builddir="$srcdir"/scst + +prepare() { + # we are disabling proc and enabling sysfs control and disabling debug. + cd "$_builddir" + make disable_proc + make debug2release + + cd "$_iscsidir" + make disable_proc + make debug2release + sed -i -e 's/^\(mods: .*\)/\1 include\/iscsi_scst_itf_ver.h/' Makefile +} + +build() { + unset ARCH + + cd "$_builddir" + make KDIR="$_ksrc" || return 1 + + cd "$_iscsidir" + make mods KDIR="$_ksrc" || return 1 +} + +package() { + cd "$_builddir" + make KDIR="$_ksrc" \ + INSTALL_MOD_PATH="$pkgdir" \ + INSTALL_DIR_H="$pkgdir"/usr/include/scst \ + install || return 1 +} + +# we sourced kernel apkbuild above so we need to override the dev() func +dev() { + default_dev +} + +iscsi() { + pkgdesc="SCST iscsi kernel module" + cd "$_iscsidir" + install -D -m 644 kernel/iscsi-scst.ko \ + "$subpkgdir"/lib/modules/$_abi_release/extra/iscsi-scst.ko + +} + +md5sums="38424f48c9fd65624e316195186fb6a7 scst-svn-1713.tar.gz +cf046db4f7cd9cf969b054dc055922d6 iscsi-scst-svn-1713.tar.gz" diff --git a/testing/scstadmin-svn/APKBUILD b/testing/scstadmin-svn/APKBUILD new file mode 100644 index 0000000000..e20ad1cb9e --- /dev/null +++ b/testing/scstadmin-svn/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: +# Maintainer: +pkgname=scstadmin-svn +pkgver=1713 +pkgrel=0 +pkgdesc="SCST administration tool written in perl" +url="http://scst.sourceforge.net" +license="GPL-2" +depends="perl" +makedepends="perl-dev" +install= +subpackages="$pkgname-doc" +source="http://alpine.nethq.org/clandmeter/src/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/scstadmin + +prepare() { + cd "$_builddir"/scst-0.9.00 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 +} + +package() { + cd "$_builddir"/scst-0.9.00 + make DESTDIR="$pkgdir" install || return 1 + cd "$_builddir" + install -Dm755 scstadmin.sysfs "$pkgdir"/usr/sbin/scstadmin || return 1 + install -Dm755 init.d/scst.gentoo "$pkgdir"/etc/init.d/scstadmin +} + +md5sums="5c78c6d4d4079a8d2c2b55f3e3119105 scstadmin-svn-1713.tar.gz" -- cgit v1.2.3 From c17f42bb70c2a0cc84124ab8b1798382b88ee6c2 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 27 May 2010 09:37:19 +0000 Subject: testing/asterisk-audio-konf: new aport A fork of AppKonference focused entirely on audio conferencing http://github.com/jthomerson/AsteriskAudioKonf/ --- .../0001-create-install-dir.patch | 24 ++++++++ testing/asterisk-audio-konf/APKBUILD | 66 ++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 testing/asterisk-audio-konf/0001-create-install-dir.patch create mode 100644 testing/asterisk-audio-konf/APKBUILD (limited to 'testing') diff --git a/testing/asterisk-audio-konf/0001-create-install-dir.patch b/testing/asterisk-audio-konf/0001-create-install-dir.patch new file mode 100644 index 0000000000..9d2f548eb1 --- /dev/null +++ b/testing/asterisk-audio-konf/0001-create-install-dir.patch @@ -0,0 +1,24 @@ +From b44f99b7ab158f3e0cf3a2344fcc58d90982378c Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Thu, 27 May 2010 09:31:03 +0000 +Subject: [PATCH] create install dir + +--- + konference/Makefile | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/konference/Makefile b/konference/Makefile +index 9cc2201..e0901df 100644 +--- a/konference/Makefile ++++ b/konference/Makefile +@@ -158,6 +158,7 @@ vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o + $(CC) $(PROFILE) -o $@ $^ -lm + + install: ++ $(INSTALL) -d $(INSTALL_MODULES_DIR) + $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR) + + +-- +1.7.1 + diff --git a/testing/asterisk-audio-konf/APKBUILD b/testing/asterisk-audio-konf/APKBUILD new file mode 100644 index 0000000000..d10dcbc91e --- /dev/null +++ b/testing/asterisk-audio-konf/APKBUILD @@ -0,0 +1,66 @@ +# Contributor: +# Maintainer: Natanael Copa +pkgname=asterisk-audio-konf +_basever=0 +_gitver=100527 +pkgver=${_basever}_git${_gitver} +pkgrel=0 +pkgdesc="A fork of AppKonference focused entirely on audio conferencing" +url="http://github.com/jthomerson/AsteriskAudioKonf/" +license="GPL" +depends= +makedepends="asterisk-dev" +install= +subpackages= +_snapfile="$pkgname-$pkgver.tar.bz2" +source="http://build.alpinelinux.org:8010/distfiles/$_snapfile + 0001-create-install-dir.patch + " + +_gitver=100527 +_giturl="git://github.com/jthomerson/AsteriskAudioKonf.git" + + +_builddir="$srcdir"/$pkgname/konference + + +snapshot() { + _gitver=$(date +%y%m%d) + pkgver=${_basever}_git$_gitver + + if [ -d "$SRCDEST"/$pkgname ]; then + cd "$SRCDEST"/$pkgname + git pull --rebase || return 1 + else + cd "$SRCDEST" + git clone $_giturl $pkgname + fi + cd "$SRCDEST" + tar -jcf $_snapfile $pkgname + + pkgrel=0 + sed -i -e "s/^_gitver=.*/_gitver=${_gitver}/" \ + -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ + "$startdir"/APKBUILD + checksum +} + +prepare() { + cd "$_builddir"/.. + for i in "$srcdir"/*.patch; do + patch -p1 -i "$i" || return 1 + done +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + make INSTALL_PREFIX="$pkgdir" install +} + +md5sums="4e81c731d4b4bd258cd426b5d5dfcdc0 asterisk-audio-konf-0_git100527.tar.bz2 +822df062f4f0890889e3be382ae90504 0001-create-install-dir.patch" -- cgit v1.2.3 From f2fc6799765b3f34567eb069c3acf9ba95ca1b57 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Thu, 27 May 2010 09:54:52 +0000 Subject: testing/iscsi-scst-svn: added missing bash to makedeps. --- testing/iscsi-scst-svn/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/iscsi-scst-svn/APKBUILD b/testing/iscsi-scst-svn/APKBUILD index 9b3ec42008..f322407eb9 100644 --- a/testing/iscsi-scst-svn/APKBUILD +++ b/testing/iscsi-scst-svn/APKBUILD @@ -9,7 +9,7 @@ url="http://iscsi-scst.sourceforge.net/" license="GPL-2" depends= install= -makedepends="openssl-dev scst-svn-scst-dev" +makedepends="openssl-dev scst-svn-scst-dev bash" subpackages= source="http://alpine.nethq.org/clandmeter/src/$pkgname-$pkgver.tar.gz iscsi-scst.initd -- cgit v1.2.3 From 1ccb41c60f45efc1e370f08ccb21a60f4dd84eb1 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 27 May 2010 18:55:51 +0000 Subject: testing/gtksourceview: upgrade to 2.10.2 --- testing/gtksourceview/APKBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'testing') diff --git a/testing/gtksourceview/APKBUILD b/testing/gtksourceview/APKBUILD index 78f48202d7..8e080b2077 100644 --- a/testing/gtksourceview/APKBUILD +++ b/testing/gtksourceview/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa pkgname=gtksourceview -pkgver=2.8.2 -pkgrel=1 +pkgver=2.10.2 +pkgrel=0 pkgdesc="A text widget adding syntax highlighting and more to GNOME" url="http://live.gnome.org/GtkSourceView" license="GPL" depends= -makedepends="gtk+-dev intltool libxml2-dev" +makedepends="gtk+-dev intltool libxml2-dev gobject-introspection" subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.8/gtksourceview-$pkgver.tar.bz2" +source="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/${pkgver%.*}/gtksourceview-$pkgver.tar.bz2" build() { cd "$srcdir"/gtksourceview-$pkgver @@ -23,4 +23,4 @@ package() { cd "$srcdir"/gtksourceview-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="5ce481d3aa7d639fe4508530b184158c gtksourceview-2.8.2.tar.bz2" +md5sums="56c849c0adea56228287abbabc7b70b9 gtksourceview-2.10.2.tar.bz2" -- cgit v1.2.3 From 7660e8aee301a15885addc5b3db55e5386a169dd Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 27 May 2010 19:12:40 +0000 Subject: testing/gdl: new aport Gnome Devtool Libraries http://www.gnome.org/ --- testing/gdl/APKBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 testing/gdl/APKBUILD (limited to 'testing') diff --git a/testing/gdl/APKBUILD b/testing/gdl/APKBUILD new file mode 100644 index 0000000000..7149885412 --- /dev/null +++ b/testing/gdl/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa +pkgname=gdl +pkgver=2.30.0 +pkgrel=0 +pkgdesc="Gnome Devtool Libraries" +url="http://www.gnome.org/" +license="GPL" +makedepends="gtk+-dev libxml2-dev intltool" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.30/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="ce4eef03a36bf6abd9f8cbad4806d7b8 gdl-2.30.0.tar.bz2" -- cgit v1.2.3 From e38ff76bf0f1d13d838453de28187d121607ab72 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 27 May 2010 19:13:16 +0000 Subject: testing/valide: new aport Val(a)IDE is an Integrated Development Environment (IDE) for the Vala programming language http://www.valaide.org/ --- testing/valide/APKBUILD | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 testing/valide/APKBUILD (limited to 'testing') diff --git a/testing/valide/APKBUILD b/testing/valide/APKBUILD new file mode 100644 index 0000000000..d26afd2a6e --- /dev/null +++ b/testing/valide/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: +# Maintainer: +pkgname=valide +pkgver=0.7.0 +pkgrel=0 +pkgdesc="Val(a)IDE is an Integrated Development Environment (IDE) for the Vala programming language" +url="http://www.valaide.org/" +license="GPL" +depends="vala" +makedepends="gtk+-dev intltool gtksourceview-dev libunique-dev python + libxml2-dev gdl-dev" +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://valide.googlecode.com/files/valide-$pkgver.tar.gz" + +# append extra dependencies to -dev subpackage +# remove if not used. +# depends_dev="somepackage-dev" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./waf -j ${JOBS:-2} configure --prefix=/usr || return 1 + ./waf -j ${JOBS:-2} +} + +package() { + cd "$_builddir" + ./waf -j ${JOBS:-2} --destdir="$pkgdir" install +} + +md5sums="d9e7d36266af3bd4c3ca592a8955285e valide-0.7.0.tar.gz" -- cgit v1.2.3 From ed3fd090e194e33c856ace790a2e255fa0a2e3f2 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 28 May 2010 07:03:05 +0000 Subject: testing/py-twisted: upgrade to 10.0.0 fixes #353 --- testing/py-twisted/APKBUILD | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'testing') diff --git a/testing/py-twisted/APKBUILD b/testing/py-twisted/APKBUILD index bc21c236f9..04e8812cbe 100644 --- a/testing/py-twisted/APKBUILD +++ b/testing/py-twisted/APKBUILD @@ -1,16 +1,15 @@ # Maintainer: Natanael Copa pkgname=py-twisted -pkgver=8.2.0 -pkgrel=2 +pkgver=10.0.0 +pkgrel=0 pkgdesc="Asynchronous networking framework written in Python." url="http://twistedmatrix.com/" license="MIT" depends="python py-crypto py-zope-interface" makedepends="python-dev" -source="http://tmrc.mit.edu/mirror/$pkgname/Twisted/8.2/Twisted-$pkgver.tar.bz2" +source="http://tmrc.mit.edu/mirror/twisted/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2" -build () -{ +build() { cd "$srcdir"/Twisted-$pkgver python setup.py build || return 1 } @@ -20,4 +19,4 @@ package() { python setup.py install --prefix=/usr --root="$pkgdir" || return 1 install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="c85f151999df3ecf04c49a781b4438d2 Twisted-8.2.0.tar.bz2" +md5sums="3b226af1a19b25e3b3e93cc6edf5e284 Twisted-10.0.0.tar.bz2" -- cgit v1.2.3 From 4a8dfc4f8927c4b3672a7051f94ecccdcd6c1ac9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 28 May 2010 10:03:14 +0000 Subject: testing/geh: new aport a simple commandline image viewer written in C/Gtk+ https://projects.pekdon.net/projects/geh --- testing/geh/APKBUILD | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 testing/geh/APKBUILD (limited to 'testing') diff --git a/testing/geh/APKBUILD b/testing/geh/APKBUILD new file mode 100644 index 0000000000..4f768bdaa6 --- /dev/null +++ b/testing/geh/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: +# Maintainer: +pkgname=geh +pkgver=0.2.0 +pkgrel=0 +pkgdesc="a simple commandline image viewer written in C/Gtk+" +url="https://projects.pekdon.net/projects/geh" +license="GPL" +depends= +makedepends="gtk+-dev intltool" +install= +subpackages="$pkgname-doc" +source="http://projects.pekdon.net/projects/geh/files/geh-$pkgver.tar.gz" + +# append extra dependencies to -dev subpackage +# remove if not used. +# depends_dev="somepackage-dev" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + # remove the 2 lines below (and this) if there is no init.d script + # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +md5sums="2349b774e7f0c288061fcfc8c296f20d geh-0.2.0.tar.gz" -- cgit v1.2.3 From 044f13dd1aec86424a06e885c386626cb9421f2f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 28 May 2010 14:04:07 +0000 Subject: testing/pekwm: new aport Fast & Light Window Manager http://pekwm.org/projects/pekwm --- testing/pekwm/APKBUILD | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 testing/pekwm/APKBUILD (limited to 'testing') diff --git a/testing/pekwm/APKBUILD b/testing/pekwm/APKBUILD new file mode 100644 index 0000000000..dcdd920f46 --- /dev/null +++ b/testing/pekwm/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: Natanael Copa +pkgname=pekwm +pkgver=0.1.12 +pkgrel=0 +pkgdesc="Fast & Light Window Manager" +url="http://pekwm.org/projects/pekwm" +license="GPL" +depends= +makedepends="libiconv-dev libx11-dev" +install= +subpackages="$pkgname-doc" +source="http://pekwm.org/projects/pekwm/files/pekwm-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="1f7f9ed32cc03f565a3ad30fd6045c1f pekwm-0.1.12.tar.gz" -- cgit v1.2.3 From 429b7b015805ef948ae9e424836d7f5bc7b17737 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 28 May 2010 14:15:34 +0000 Subject: testing/osmo: add ical support --- testing/osmo/APKBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/osmo/APKBUILD b/testing/osmo/APKBUILD index 489874e360..1413096803 100644 --- a/testing/osmo/APKBUILD +++ b/testing/osmo/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa pkgname=osmo pkgver=0.2.10 -pkgrel=0 +pkgrel=1 pkgdesc="A handy personal organizer" url="http://clayo.org/osmo/" license="GPL" -makedepends="gtk+-dev libnotify-dev libxml2-dev autoconf automake" +makedepends="gtk+-dev libnotify-dev libical-dev libxml2-dev autoconf automake" install= subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname-pim/$pkgname-$pkgver.tar.gz @@ -24,6 +24,7 @@ prepare() { build() { cd "$_builddir" + CFLAGS="$CFLAGS -I/usr/include/libical" ./configure --prefix=/usr || return 1 make || return 1 } -- cgit v1.2.3 From 84c0d12c2c88d26659a209939f1316810a0b29ae Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 29 May 2010 12:58:09 +0000 Subject: testing/xfce4-note-plugin: new aport Notes plugin for the Xfce4 desktop http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin --- testing/xfce4-notes-plugin/APKBUILD | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 testing/xfce4-notes-plugin/APKBUILD (limited to 'testing') diff --git a/testing/xfce4-notes-plugin/APKBUILD b/testing/xfce4-notes-plugin/APKBUILD new file mode 100644 index 0000000000..42e7ccd175 --- /dev/null +++ b/testing/xfce4-notes-plugin/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: +pkgname=xfce4-notes-plugin +pkgver=1.7.2 +pkgrel=0 +pkgdesc="Notes plugin for the Xfce4 desktop" +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" +license="GPL" +depends= +makedepends="xfce4-panel-dev libunique-dev" +install= +subpackages= +source="http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/xfce4-notes-plugin-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="054742ecc4bb83de6c1447b023938d3e xfce4-notes-plugin-1.7.2.tar.bz2" -- cgit v1.2.3 From 3acb14e008f0b7f56d5185eae23c452cf431e576 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 29 May 2010 15:47:18 +0000 Subject: main/libunique: moved from testing --- testing/libunique/APKBUILD | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 testing/libunique/APKBUILD (limited to 'testing') diff --git a/testing/libunique/APKBUILD b/testing/libunique/APKBUILD deleted file mode 100644 index 59bd45083f..0000000000 --- a/testing/libunique/APKBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=libunique -pkgver=1.1.6 -pkgrel=1 -pkgdesc="Library for writing single instance applications" -url="http://live.gnome.org/LibUnique" -license="LGPL" -depends= -makedepends="pkgconfig gtk+-dev dbus-glib-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.1/$pkgname-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 -} -md5sums="7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2" -- cgit v1.2.3 From 5c47b9f79cd17d97ba4f91eb665dd0df3014e840 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 29 May 2010 15:47:47 +0000 Subject: main/xfce4-notes-plugin: moved from aports --- testing/xfce4-notes-plugin/APKBUILD | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 testing/xfce4-notes-plugin/APKBUILD (limited to 'testing') diff --git a/testing/xfce4-notes-plugin/APKBUILD b/testing/xfce4-notes-plugin/APKBUILD deleted file mode 100644 index 42e7ccd175..0000000000 --- a/testing/xfce4-notes-plugin/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: -# Maintainer: -pkgname=xfce4-notes-plugin -pkgver=1.7.2 -pkgrel=0 -pkgdesc="Notes plugin for the Xfce4 desktop" -url="http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" -license="GPL" -depends= -makedepends="xfce4-panel-dev libunique-dev" -install= -subpackages= -source="http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/xfce4-notes-plugin-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" - # apply patches here -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install -} - -md5sums="054742ecc4bb83de6c1447b023938d3e xfce4-notes-plugin-1.7.2.tar.bz2" -- cgit v1.2.3 From 0652de5a797997bc087c9e0065184a127e7ddac2 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 29 May 2010 16:18:02 +0000 Subject: testing/thunar-media-tags-plugin: new aport Media tags plugin for Thunar file manager http://thunar.xfce.org/pwiki/projects/thunar-media-tags-plugin --- testing/thunar-media-tags-plugin/APKBUILD | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 testing/thunar-media-tags-plugin/APKBUILD (limited to 'testing') diff --git a/testing/thunar-media-tags-plugin/APKBUILD b/testing/thunar-media-tags-plugin/APKBUILD new file mode 100644 index 0000000000..cbcb46ac39 --- /dev/null +++ b/testing/thunar-media-tags-plugin/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: Natanael Copa +pkgname=thunar-media-tags-plugin +pkgver=0.1.2 +pkgrel=0 +pkgdesc="Media tags plugin for Thunar file manager" +url="http://thunar.xfce.org/pwiki/projects/thunar-media-tags-plugin" +license="GPL" +depends= +makedepends="thunar-dev taglib-dev" +install= +subpackages= +source="http://mocha.xfce.org/archive/src/thunar-plugins/thunar-media-tags-plugin/${pkgver%.*}/thunar-media-tags-plugin-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/lib/*/*.la +} + +md5sums="8a95f0ea4df6f757c1c94eb5442d2ff5 thunar-media-tags-plugin-0.1.2.tar.bz2" -- cgit v1.2.3 From fd0cf32e80cc193c56fabc8639e91bf022bc8b06 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 29 May 2010 16:23:02 +0000 Subject: testing/hardinfo: added support for alpine OS release --- testing/hardinfo/APKBUILD | 11 +++++++---- testing/hardinfo/hardinfo-alpine.patch | 10 ++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 testing/hardinfo/hardinfo-alpine.patch (limited to 'testing') diff --git a/testing/hardinfo/APKBUILD b/testing/hardinfo/APKBUILD index 30b5794916..8b6db2bf40 100644 --- a/testing/hardinfo/APKBUILD +++ b/testing/hardinfo/APKBUILD @@ -1,19 +1,21 @@ # Maintainer: Natanael Copa pkgname=hardinfo pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A system information and benchmark tool." url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" license="GPL-2" makedepends="gtk+-dev libsoup-dev>=2.4.0 gnutls-dev>=2.4.1" depends= source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2 - fixsensors.patch" + fixsensors.patch + hardinfo-alpine.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 < "$srcdir"/fixsensors.patch || return 1 + patch -p1 -i "$srcdir"/fixsensors.patch || return 1 + patch -p1 -i "$srcdir"/hardinfo-alpine.patch || return 1 # configure scrip says bash but bb ash works just fine sed -i -e '1,1s/bash/sh/' configure } @@ -31,4 +33,5 @@ package() { echo "Alpine Linux" > "$pkgdir"/etc/hardinfo.distro } md5sums="6fb38992e140f2fab16518ae1f38e188 hardinfo-0.5.1.tar.bz2 -05c212db07b9f152cdea052ff7bb28fa fixsensors.patch" +05c212db07b9f152cdea052ff7bb28fa fixsensors.patch +ae8d38e5b35fb2c9c5f425dde3ba27cb hardinfo-alpine.patch" diff --git a/testing/hardinfo/hardinfo-alpine.patch b/testing/hardinfo/hardinfo-alpine.patch new file mode 100644 index 0000000000..279aa5d539 --- /dev/null +++ b/testing/hardinfo/hardinfo-alpine.patch @@ -0,0 +1,10 @@ +--- ./computer.h.orig ++++ ./computer.h +@@ -23,6 +23,7 @@ + static struct { + gchar *file, *codename; + } distro_db[] = { ++ { DB_PREFIX "alpine-version", "al" }, + { DB_PREFIX "debian_version", "deb" }, + { DB_PREFIX "slackware-version", "slk" }, + { DB_PREFIX "mandrake-release", "mdk" }, -- cgit v1.2.3 From da02122bd4099394d80812b536071bf619e997b7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 29 May 2010 16:30:20 +0000 Subject: main/nspr: moved from testing --- testing/nspr/APKBUILD | 64 ------------- testing/nspr/nspr-4.6.1-config-1.patch | 11 --- testing/nspr/nspr-4.7.0-prtime.patch | 26 ----- testing/nspr/nspr-4.8-config.patch | 47 --------- testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch | 126 ------------------------- 5 files changed, 274 deletions(-) delete mode 100644 testing/nspr/APKBUILD delete mode 100644 testing/nspr/nspr-4.6.1-config-1.patch delete mode 100644 testing/nspr/nspr-4.7.0-prtime.patch delete mode 100644 testing/nspr/nspr-4.8-config.patch delete mode 100644 testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch (limited to 'testing') diff --git a/testing/nspr/APKBUILD b/testing/nspr/APKBUILD deleted file mode 100644 index 38f9d9c4d1..0000000000 --- a/testing/nspr/APKBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=nspr -pkgver=4.8.4 -pkgrel=0 -pkgdesc="Netscape Portable Runtime" -url="http://www.mozilla.org/projects/nspr/" -license="MPL-1.1 GPL-2 LGPL-2.1" -depends= -subpackages="$pkgname-dev" -source="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz - nspr-4.6.1-config-1.patch - nspr-4.7.0-prtime.patch - nspr-4.8-config.patch - nspr-4.8-pkgconfig-gentoo-3.patch - " - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" - mkdir build inst - for i in "$srcdir"/*.patch; do - msg "Applying $i" - patch -p1 -i "$i" || return 1 - done - # respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - mozilla/nsprpub/config/rules.mk -} - -build() { - cd "$_builddir"/build - ../mozilla/nsprpub/configure --prefix=/usr \ - || return 1 - make CC="${CC:-gcc}" CXX="${CXX:-g++}" || return 1 -} - -package() { - local file= minor_version=${pkgver#*.} - minor_version=${minor_version%.*} - - cd "$_builddir"/build - make DESTDIR="$pkgdir" install || die "emake install failed" - - cd "$pkgdir"/usr/lib - rm -f *.a - for file in *.so; do - mv ${file} ${file}.${minor_version} || return 1 - ln -s ${file}.${minor_version} ${file} || return 1 - done - - cd "$_builddir"/build/config - install -Dm755 nspr-config "$pkgdir"/usr/bin/nspr-config || return 1 - install -Dm644 nspr.pc "$pkgdir"/usr/lib/pkgconfig/nspr.pc || return 1 - rm -rf "$pkgdir"/usr/bin/prerr.properties \ - "$pkgdir"/usr/bin/compile-et.pl \ - "$pkgdir"/usr/share/aclocal/nspr.m4 \ - "$pkgdir"/usr/include/nspr/md -} - -md5sums="a85bdbe1eb646aa32c785a37d8e3a2f5 nspr-4.8.4.tar.gz -d204a641dd7cbf6751d14dc6b98835f1 nspr-4.6.1-config-1.patch -c48e1f47799c1cff7e3bf46dc0e653f1 nspr-4.7.0-prtime.patch -c790c638a7c9fd1d731272f464f065c6 nspr-4.8-config.patch -5b67b4339be94d0dbc4337a55eabe73a nspr-4.8-pkgconfig-gentoo-3.patch" diff --git a/testing/nspr/nspr-4.6.1-config-1.patch b/testing/nspr/nspr-4.6.1-config-1.patch deleted file mode 100644 index b919c7930b..0000000000 --- a/testing/nspr/nspr-4.6.1-config-1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/mozilla/nsprpub/configure.orig 2006-01-14 22:41:37.000000000 +0000 -+++ b/mozilla/nsprpub/configure 2006-01-14 22:49:14.000000000 +0000 -@@ -3893,7 +3893,7 @@ - PR_MD_CSRCS=linux.c - MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' - DSO_CFLAGS=-fPIC -- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' -+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)' - _OPTIMIZE_FLAGS=-O2 - _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that - # combo is not yet good at debugging inlined diff --git a/testing/nspr/nspr-4.7.0-prtime.patch b/testing/nspr/nspr-4.7.0-prtime.patch deleted file mode 100644 index 74d5534d5a..0000000000 --- a/testing/nspr/nspr-4.7.0-prtime.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200 -+++ b/mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200 -@@ -1536,7 +1536,7 @@ - case TT_EET: zone_offset = 2 * 60; break; - case TT_JST: zone_offset = 9 * 60; break; - default: -- PR_ASSERT (0); -+ return PR_FAILURE; - break; - } - } -@@ -1578,11 +1578,12 @@ - struct tm localTime; - time_t secs; - -- PR_ASSERT(result->tm_month > -1 && -+ if (!(result->tm_month > -1 && - result->tm_mday > 0 && - result->tm_hour > -1 && - result->tm_min > -1 && -- result->tm_sec > -1); -+ result->tm_sec > -1)) -+ return PR_FAILURE; - - /* - * To obtain time_t from a tm structure representing the local diff --git a/testing/nspr/nspr-4.8-config.patch b/testing/nspr/nspr-4.8-config.patch deleted file mode 100644 index 4db2517e4e..0000000000 --- a/testing/nspr/nspr-4.8-config.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 -+++ b/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 -@@ -112,6 +112,10 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_ARCH), Linux) -+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' -+endif -+ - ifeq ($(OS_ARCH),OS2) - MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def - GARBAGE += $(MAPFILE) ---- a/mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 -+++ b/mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 -@@ -102,6 +102,10 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_ARCH), Linux) -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif -+ - ifeq ($(OS_ARCH),OS2) - MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def - GARBAGE += $(MAPFILE) ---- a/mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 -+++ b/mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 -@@ -168,6 +168,7 @@ - else - OS_LIBS = -ldl - endif -+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' - endif - - ifeq ($(OS_ARCH),HP-UX) ---- a/mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 -+++ b/mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 -@@ -122,7 +122,7 @@ - fi - - if test "$echo_libs" = "yes"; then -- libdirs=-L$libdir -+ libdirs="-Wl,-R$libdir -L$libdir" - if test -n "$lib_plds"; then - libdirs="$libdirs -lplds${major_version}" - fi diff --git a/testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch b/testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch deleted file mode 100644 index 2525928db4..0000000000 --- a/testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk ---- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 -@@ -162,3 +162,4 @@ - RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include - RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin - RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib -+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in ---- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 -@@ -52,9 +52,10 @@ - - # autoconf.mk must be deleted last (from the top-level directory) - # because it is included by every makefile. --DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config -+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc - - RELEASE_BINS = nspr-config -+RELEASE_PC = nspr.pc - - include $(topsrcdir)/config/config.mk - -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in ---- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 -@@ -92,13 +92,13 @@ - - # Set variables that may be dependent upon other variables - if test -z "$exec_prefix"; then -- exec_prefix=@exec_prefix@ -+ exec_prefix=`pkg-config --variable=exec_prefix nspr` - fi - if test -z "$includedir"; then -- includedir=@includedir@ -+ includedir=`pkg-config --variable=includedir nspr` - fi - if test -z "$libdir"; then -- libdir=@libdir@ -+ libdir=`pkg-config --variable=libdir nspr` - fi - - if test "$echo_prefix" = "yes"; then -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in ---- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSPR -+Description: The Netscape Portable Runtime -+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ -+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -Wl,-R${libdir} -+Cflags: -I${includedir} -+ -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk ---- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 -@@ -211,7 +211,7 @@ - rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) - +$(LOOP_OVER_DIRS) - --install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) -+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) - ifdef RELEASE_BINS - $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) - endif -@@ -221,6 +221,9 @@ - ifdef RELEASE_LIBS - $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) - endif -+ifdef RELEASE_PC -+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ -+endif - +$(LOOP_OVER_DIRS) - - release:: export -@@ -272,6 +275,23 @@ - fi - cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) - endif -+ifdef RELEASE_PC -+ @echo "Copying pkg-config files to release directory" -+ @if test -z "$(BUILD_NUMBER)"; then \ -+ echo "BUILD_NUMBER must be defined"; \ -+ false; \ -+ else \ -+ true; \ -+ fi -+ @if test ! -d $(RELEASE_PC_DEST); then \ -+ rm -rf $(RELEASE_PC_DEST); \ -+ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ -+ else \ -+ true; \ -+ fi -+ cp $(RELEASE_PC) $(RELEASE_PC_DEST) -+endif -+ - +$(LOOP_OVER_DIRS) - - alltags: -diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure ---- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 -+++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 -@@ -6037,6 +6037,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in ---- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 -@@ -2871,6 +2871,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -- cgit v1.2.3 From 9c0e50a29937432e6158b0ed64a54afff292cc7f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 29 May 2010 16:30:37 +0000 Subject: main/nss: moved from testing --- testing/nss/APKBUILD | 119 --- testing/nss/add_spi+cacert_ca_certs.patch | 1168 ------------------------ testing/nss/nss-config.in | 145 --- testing/nss/nss-no-rpath.patch | 14 - testing/nss/nss-nolocalsql.patch | 52 -- testing/nss/nss.pc.in | 11 - testing/nss/ssl-renegotiate-transitional.patch | 21 - 7 files changed, 1530 deletions(-) delete mode 100644 testing/nss/APKBUILD delete mode 100644 testing/nss/add_spi+cacert_ca_certs.patch delete mode 100644 testing/nss/nss-config.in delete mode 100644 testing/nss/nss-no-rpath.patch delete mode 100644 testing/nss/nss-nolocalsql.patch delete mode 100644 testing/nss/nss.pc.in delete mode 100644 testing/nss/ssl-renegotiate-transitional.patch (limited to 'testing') diff --git a/testing/nss/APKBUILD b/testing/nss/APKBUILD deleted file mode 100644 index c795669ea7..0000000000 --- a/testing/nss/APKBUILD +++ /dev/null @@ -1,119 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=nss -pkgver=3.12.6 -_ver=3_12_6 -pkgrel=0 -pkgdesc="Mozilla Network Security Services" -url="http://www.mozilla.org/projects/security/pki/nss/" -license="MPL GPL" -depends= -makedepends="nspr-dev sqlite-dev zlib-dev perl" -subpackages="$pkgname-dev libnss" -source="ftp://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src/$pkgname-$pkgver.tar.gz - nss-nolocalsql.patch - nss-no-rpath.patch - nss.pc.in - nss-config.in - add_spi+cacert_ca_certs.patch - ssl-renegotiate-transitional.patch" -depends_dev="nspr-dev" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" - patch -Np1 -i ""$srcdir"/add_spi+cacert_ca_certs.patch" || return 1 - patch -Np1 -i ""$srcdir"/ssl-renegotiate-transitional.patch" || return 1 - patch -Np0 -i ""$srcdir"/nss-nolocalsql.patch" || return 1 - patch -Np0 -i ""$srcdir"/nss-no-rpath.patch" || return 1 - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ - mozilla/security/coreconf/rules.mk - -} - -build() { - cd "$_builddir" - unset CFLAGS - unset CXXFLAGS - export BUILD_OPT=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` - export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` - export XCFLAGS="${CFLAGS}" - make -j 1 -C mozilla/security/coreconf || return 1 - make -j 1 -C mozilla/security/dbm || return 1 - make -j 1 -C mozilla/security/nss || return 1 -} - -package() { - cd "$_builddir" - install -m755 -d "$pkgdir"/usr/lib/pkgconfig - install -m755 -d "$pkgdir"/usr/bin - install -m755 -d "$pkgdir"/usr/include/nss - - NSS_VMAJOR=`awk '/#define.*NSS_VMAJOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h ` - msg "DEBUG: $NSS_VMAJOR" - NSS_VMINOR=`awk '/#define.*NSS_VMINOR/ {print $3}' mozilla/security/nss/lib/nss/nss.h` - NSS_VPATCH=`awk '/#define.*NSS_VPATCH"/ {print $3}' mozilla/security/nss/lib/nss/nss.h` - - # pkgconfig files - sed "$srcdir"/nss.pc.in \ - -e "s,%libdir%,/usr/lib,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,$pkgver,g" \ - -e "s,%NSS_VERSION%,$pkgver,g" \ - > "$pkgdir"/usr/lib/pkgconfig/nss.pc \ - || return 1 - ln -sf nss.pc "$pkgdir"/usr/lib/pkgconfig/mozilla-nss.pc || return 1 - chmod 644 "$pkgdir"/usr/lib/pkgconfig/*.pc || return 1 - - # nss-config - sed "$srcdir"/nss-config.in \ - -e "s,@libdir@,/usr/lib,g" \ - -e "s,@prefix@,/usr/bin,g" \ - -e "s,@exec_prefix@,/usr/bin,g" \ - -e "s,@includedir@,/usr/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ - -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ - -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ - > "$pkgdir"/usr/bin/nss-config || return 1 - chmod 755 "$pkgdir"/usr/bin/nss-config || return 1 - local minor=${pkgver#*.} - minor=${minor%.*} - for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ - libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so; do - install -m755 mozilla/dist/*.OBJ/lib/${file} \ - "$pkgdir"/usr/lib/${file}.$minor || return 1 - ln -s $file.$minor "$pkgdir"/usr/lib/$file - done - install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "$pkgdir"/usr/lib/ \ - || return 1 - install -m644 mozilla/dist/*.OBJ/lib/*.chk "$pkgdir"/usr/lib/ \ - || return 1 - - for file in certutil cmsutil crlutil modutil pk12util shlibsign \ - signtool signver ssltap; do - install -m755 mozilla/dist/*.OBJ/bin/${file} "$pkgdir"/usr/bin/\ - || return 1 - done - install -m644 mozilla/dist/public/nss/*.h "$pkgdir"/usr/include/nss/ \ - || return 1 -} - -libnss() { - pkgdesc="Mozilla Network Security Service libraries" - mkdir -p "$subpkgdir"/usr/ - mv "$pkgdir"/usr/lib "$subpkgdir"/usr -} - -md5sums="da42596665f226de5eb3ecfc1ec57cd1 nss-3.12.6.tar.gz -1d8305dc458d28c6f32746d9132b9873 nss-nolocalsql.patch -e5c97db0c884d5f4cfda21e562dc9bba nss-no-rpath.patch -c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in -46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in -a744b499e7da252acd9ac8ff09af3d48 add_spi+cacert_ca_certs.patch -d83c7b61abb7e9f8f7bcd157183d1ade ssl-renegotiate-transitional.patch" diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch deleted file mode 100644 index a8969ee43f..0000000000 --- a/testing/nss/add_spi+cacert_ca_certs.patch +++ /dev/null @@ -1,1168 +0,0 @@ -## 95_add_spi+cacert_ca_certs.patch by martin f. krafft -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds the SPI Inc. and CAcert.org CA certificates - -diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.c b/mozilla/security/nss/lib/ckfw/builtins/certdata.c -index 2c6fdab..2fb754c 100644 ---- a/mozilla/security/nss/lib/ckfw/builtins/certdata.c -+++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.c -@@ -35,7 +35,7 @@ - * - * ***** END LICENSE BLOCK ***** */ - #ifdef DEBUG --static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $"; -+static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $"; - #endif /* DEBUG */ - - #ifndef BUILTINS_H -@@ -1020,6 +1020,24 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 [] = { - static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED - }; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_322 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_323 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_324 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_325 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_326 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; - #ifdef DEBUG - static const NSSItem nss_builtins_items_0 [] = { - { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -@@ -1028,7 +1046,7 @@ static const NSSItem nss_builtins_items_0 [] = { - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"CVS ID", (PRUint32)7 }, - { (void *)"NSS", (PRUint32)4 }, -- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.59 $ $Date: 2010/02/16 22:14:34 $", (PRUint32)160 } -+ { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.58 $ $Date: 2010/02/16 22:14:35 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $", (PRUint32)160 } - }; - #endif /* DEBUG */ - static const NSSItem nss_builtins_items_1 [] = { -@@ -21537,6 +21555,531 @@ static const NSSItem nss_builtins_items_321 [] = { - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; -+static const NSSItem nss_builtins_items_322 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\000" -+, (PRUint32)3 }, -+ { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000" -+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" -+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" -+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" -+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" -+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" -+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" -+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" -+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" -+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063" -+"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060" -+"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016" -+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" -+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" -+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" -+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" -+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" -+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" -+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" -+"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" -+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" -+"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007" -+"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002" -+"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011" -+"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315" -+"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230" -+"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272" -+"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016" -+"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052" -+"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262" -+"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140" -+"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150" -+"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273" -+"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022" -+"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234" -+"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334" -+"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070" -+"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232" -+"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044" -+"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355" -+"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252" -+"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352" -+"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276" -+"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306" -+"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320" -+"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167" -+"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335" -+"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324" -+"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246" -+"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106" -+"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272" -+"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334" -+"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304" -+"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060" -+"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265" -+"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071" -+"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230" -+"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260" -+"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016" -+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036" -+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057" -+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042" -+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164" -+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151" -+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011" -+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162" -+"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001" -+"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037" -+"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160" -+"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157" -+"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006" -+"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164" -+"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060" -+"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045" -+"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162" -+"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077" -+"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102" -+"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165" -+"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164" -+"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040" -+"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167" -+"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006" -+"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001" -+"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201" -+"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275" -+"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234" -+"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323" -+"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073" -+"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140" -+"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353" -+"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160" -+"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334" -+"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231" -+"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116" -+"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145" -+"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031" -+"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363" -+"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330" -+"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367" -+"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260" -+"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223" -+"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335" -+"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026" -+"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005" -+"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361" -+"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371" -+"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246" -+"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206" -+"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153" -+"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344" -+"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143" -+"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362" -+"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226" -+"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175" -+"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305" -+"\103" -+, (PRUint32)1857 } -+}; -+static const NSSItem nss_builtins_items_323 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 }, -+ { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106" -+"\166\316\217\063" -+, (PRUint32)20 }, -+ { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153" -+, (PRUint32)16 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\000" -+, (PRUint32)3 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; -+static const NSSItem nss_builtins_items_324 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143" -+"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004" -+"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101" -+"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004" -+"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040" -+"\063\040\122\157\157\164" -+, (PRUint32)86 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\001" -+, (PRUint32)3 }, -+ { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001" -+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060" -+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164" -+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164" -+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056" -+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101" -+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165" -+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110" -+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100" -+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065" -+"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060" -+"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022" -+"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156" -+"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164" -+"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157" -+"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143" -+"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164" -+"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" -+"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" -+"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335" -+"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175" -+"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163" -+"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144" -+"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001" -+"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171" -+"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313" -+"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011" -+"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353" -+"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277" -+"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331" -+"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205" -+"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073" -+"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161" -+"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371" -+"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047" -+"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252" -+"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102" -+"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064" -+"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133" -+"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242" -+"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137" -+"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325" -+"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150" -+"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230" -+"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140" -+"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347" -+"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321" -+"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206" -+"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257" -+"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164" -+"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373" -+"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003" -+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006" -+"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006" -+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072" -+"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162" -+"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034" -+"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162" -+"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003" -+"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001" -+"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002" -+"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101" -+"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160" -+"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206" -+"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241" -+"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072" -+"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135" -+"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253" -+"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364" -+"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172" -+"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302" -+"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214" -+"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074" -+"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154" -+"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025" -+"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352" -+"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231" -+"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213" -+"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325" -+"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242" -+"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214" -+"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027" -+"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057" -+"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224" -+"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134" -+"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356" -+"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005" -+"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355" -+"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143" -+"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123" -+"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243" -+"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005" -+"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156" -+"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317" -+"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360" -+"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101" -+"\322\156\245\033\231\047\200\347\013\251\250\000" -+, (PRUint32)1548 } -+}; -+static const NSSItem nss_builtins_items_325 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 }, -+ { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304" -+"\030\116\052\055" -+, (PRUint32)20 }, -+ { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266" -+, (PRUint32)16 }, -+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157" -+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150" -+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164" -+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103" -+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101" -+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206" -+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164" -+"\100\143\141\143\145\162\164\056\157\162\147" -+, (PRUint32)123 }, -+ { (void *)"\002\001\001" -+, (PRUint32)3 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; -+static const NSSItem nss_builtins_items_326 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" -+, (PRUint32)11 }, -+ { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000" -+"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206" -+"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003" -+"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010" -+"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125" -+"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163" -+"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167" -+"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151" -+"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003" -+"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061" -+"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146" -+"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061" -+"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026" -+"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151" -+"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063" -+"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060" -+"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125" -+"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023" -+"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004" -+"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061" -+"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141" -+"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143" -+"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125" -+"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036" -+"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151" -+"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045" -+"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150" -+"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156" -+"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110" -+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002" -+"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051" -+"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074" -+"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271" -+"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240" -+"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321" -+"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265" -+"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175" -+"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375" -+"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161" -+"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342" -+"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172" -+"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056" -+"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247" -+"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310" -+"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361" -+"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356" -+"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110" -+"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151" -+"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316" -+"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307" -+"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320" -+"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205" -+"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123" -+"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154" -+"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275" -+"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356" -+"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250" -+"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204" -+"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147" -+"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305" -+"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057" -+"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124" -+"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060" -+"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161" -+"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122" -+"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346" -+"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102" -+"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061" -+"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016" -+"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025" -+"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141" -+"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037" -+"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040" -+"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061" -+"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141" -+"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103" -+"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157" -+"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015" -+"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100" -+"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216" -+"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377" -+"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206" -+"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035" -+"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102" -+"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151" -+"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164" -+"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102" -+"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141" -+"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055" -+"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206" -+"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057" -+"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143" -+"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125" -+"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164" -+"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016" -+"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015" -+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002" -+"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162" -+"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030" -+"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255" -+"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065" -+"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014" -+"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306" -+"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051" -+"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017" -+"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302" -+"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213" -+"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017" -+"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162" -+"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152" -+"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357" -+"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266" -+"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104" -+"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177" -+"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253" -+"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206" -+"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217" -+"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265" -+"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225" -+"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140" -+"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207" -+"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252" -+"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340" -+"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254" -+"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275" -+"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132" -+"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151" -+"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005" -+"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004" -+"\243\140" -+, (PRUint32)2066 } -+}; -+static const NSSItem nss_builtins_items_327 [] = { -+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 }, -+ { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044" -+"\251\220\103\034" -+, (PRUint32)20 }, -+ { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170" -+, (PRUint32)16 }, -+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123" -+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141" -+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144" -+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125" -+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040" -+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162" -+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157" -+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004" -+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101" -+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206" -+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163" -+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147" -+, (PRUint32)191 }, -+ { (void *)"\002\011\000\350\216\266\311\370\052\024\050" -+, (PRUint32)11 }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; - - builtinsInternalObject - nss_builtins_data[] = { -@@ -21863,11 +22406,17 @@ nss_builtins_data[] = { - { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} }, - { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} }, - { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} }, -- { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} } -+ { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }, -+ { 11, nss_builtins_types_322, nss_builtins_items_322, {NULL} }, -+ { 13, nss_builtins_types_323, nss_builtins_items_323, {NULL} }, -+ { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} }, -+ { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }, -+ { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, -+ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } - }; - const PRUint32 - #ifdef DEBUG -- nss_builtins_nObjects = 321+1; -+ nss_builtins_nObjects = 327+1; - #else -- nss_builtins_nObjects = 321; -+ nss_builtins_nObjects = 327; - #endif /* DEBUG */ -diff --git a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -index 22ed023..a8b94dd 100644 ---- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -+++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -@@ -22200,3 +22200,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 1 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 -+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 -+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 -+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 -+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 -+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 -+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 -+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 -+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 -+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 -+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 -+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 -+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 -+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 -+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 -+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 -+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 -+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 -+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 -+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 -+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 -+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 -+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 -+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 -+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 -+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 -+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 -+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 -+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 -+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 -+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 -+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 -+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 -+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 -+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 -+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 -+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 -+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 -+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 -+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 -+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 -+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 -+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 -+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 -+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 -+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 -+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 -+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 -+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 -+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 -+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 -+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 -+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 -+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 -+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 -+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 -+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 -+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 -+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 -+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 -+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 -+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 -+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 -+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 -+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 -+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 -+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 -+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 -+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 -+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 -+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 -+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 -+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 -+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 -+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 -+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 -+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 -+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 -+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 -+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 -+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 -+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 -+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 -+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 -+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 -+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 -+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 -+\103 -+END -+ -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 -+\166\316\217\063 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 3 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 -+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 -+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 -+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 -+\063\040\122\157\157\164 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 -+END -+ -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 -+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 -+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 -+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 -+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 -+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 -+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 -+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 -+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 -+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 -+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 -+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 -+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 -+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 -+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 -+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 -+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 -+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 -+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 -+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 -+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 -+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 -+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 -+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 -+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 -+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 -+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 -+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 -+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 -+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 -+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 -+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 -+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 -+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 -+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 -+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 -+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 -+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 -+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 -+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 -+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 -+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 -+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 -+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 -+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 -+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 -+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 -+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 -+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 -+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 -+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 -+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 -+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 -+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 -+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 -+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 -+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 -+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 -+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 -+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 -+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 -+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 -+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 -+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 -+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 -+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 -+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 -+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 -+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 -+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 -+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 -+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 -+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 -+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 -+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 -+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 -+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 -+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 -+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 -+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 -+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 -+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 -+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 -+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 -+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 -+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 -+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 -+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 -+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 -+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 -+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 -+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 -+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 -+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 -+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 -+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 -+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 -+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 -+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 -+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 -+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 -+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 -+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 -+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 -+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 -+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 -+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 -+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 -+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 -+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 -+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 -+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 -+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 -+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 -+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 -+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 -+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 -+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 -+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 -+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 -+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 -+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 -+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 -+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 -+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 -+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 -+\243\140 -+END -+ -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 -+\251\220\103\034 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in deleted file mode 100644 index f8f893e71a..0000000000 --- a/testing/nss/nss-config.in +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MOD_MAJOR_VERSION@ -minor_version=@MOD_MINOR_VERSION@ -patch_version=@MOD_PATCH_VERSION@ - -usage() -{ - cat <&2 -fi - -lib_ssl=yes -lib_smime=yes -lib_nss=yes -lib_nssutil=yes - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --includedir=*) - includedir=$optarg - ;; - --includedir) - echo_includedir=yes - ;; - --libdir=*) - libdir=$optarg - ;; - --libdir) - echo_libdir=yes - ;; - --version) - echo ${major_version}.${minor_version}.${patch_version} - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - ssl) - lib_ssl=yes - ;; - smime) - lib_smime=yes - ;; - nss) - lib_nss=yes - ;; - nssutil) - lib_nssutil=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -# Set variables that may be dependent upon other variables -if test -z "$exec_prefix"; then - exec_prefix=`pkg-config --variable=exec_prefix nss` -fi -if test -z "$includedir"; then - includedir=`pkg-config --variable=includedir nss` -fi -if test -z "$libdir"; then - libdir=`pkg-config --variable=libdir nss` -fi - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_includedir" = "yes"; then - echo $includedir -fi - -if test "$echo_libdir" = "yes"; then - echo $libdir -fi - -if test "$echo_cflags" = "yes"; then - echo -I$includedir -fi - -if test "$echo_libs" = "yes"; then - libdirs="-Wl,-rpath-link,$libdir -L$libdir" - if test -n "$lib_ssl"; then - libdirs="$libdirs -lssl${major_version}" - fi - if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime${major_version}" - fi - if test -n "$lib_nss"; then - libdirs="$libdirs -lnss${major_version}" - fi - if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil${major_version}" - fi - echo $libdirs -fi - diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch deleted file mode 100644 index 35ea573154..0000000000 --- a/testing/nss/nss-no-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 -+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 -@@ -52,9 +52,9 @@ - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' - endif - endif - diff --git a/testing/nss/nss-nolocalsql.patch b/testing/nss/nss-nolocalsql.patch deleted file mode 100644 index dc75a223fc..0000000000 --- a/testing/nss/nss-nolocalsql.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile ---- ./mozilla/security/nss/lib/Makefile.nolocalsql 2010-02-27 16:40:25.891777537 -0800 -+++ ./mozilla/security/nss/lib/Makefile 2010-02-27 16:41:59.175902327 -0800 -@@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB - ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. - endif - --ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE --SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. --endif --endif -+#ifndef MOZILLA_CLIENT -+#ifndef NSS_USE_SYSTEM_SQLITE -+#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. -+#endif -+#endif - - ifndef MOZILLA_CLIENT - ifeq ($(OS_ARCH),Linux) -diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn ---- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2010-02-27 16:44:24.998777709 -0800 -+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2010-02-27 16:45:08.533803472 -0800 -@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def - - DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" - --ifdef MOZILLA_CLIENT --INCLUDES += -I$(DIST)/include/sqlite3 --endif -+#ifdef MOZILLA_CLIENT -+#INCLUDES += -I$(DIST)/include/sqlite3 -+#endif - - CSRCS = \ - dbmshim.c \ -diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn ---- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2010-02-27 16:42:52.213902231 -0800 -+++ ./mozilla/security/nss/lib/softoken/manifest.mn 2010-02-27 16:43:34.040776788 -0800 -@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def - - DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" - --ifdef MOZILLA_CLIENT --INCLUDES += -I$(DIST)/include/sqlite3 --endif -+#ifdef MOZILLA_CLIENT -+#INCLUDES += -I$(DIST)/include/sqlite3 -+#endif - - EXPORTS = \ - secmodt.h \ diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in deleted file mode 100644 index d47b9e1469..0000000000 --- a/testing/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -Cflags: -I${includedir} diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch deleted file mode 100644 index f457c55518..0000000000 --- a/testing/nss/ssl-renegotiate-transitional.patch +++ /dev/null @@ -1,21 +0,0 @@ -Enable transitional scheme for ssl renegotiation: - -(from mozilla/security/nss/lib/ssl/ssl.h) -Disallow unsafe renegotiation in server sockets only, but allow clients -to continue to renegotiate with vulnerable servers. -This value should only be used during the transition period when few -servers have been upgraded. - -diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c -index f1d1921..c074360 100644 ---- a/mozilla/security/nss/lib/ssl/sslsock.c -+++ b/mozilla/security/nss/lib/ssl/sslsock.c -@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { - PR_FALSE, /* noLocks */ - PR_FALSE, /* enableSessionTickets */ - PR_FALSE, /* enableDeflate */ -- 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - }; - -- cgit v1.2.3 From e26ad95a03e076ef2003647120b584f47313ca00 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 29 May 2010 16:31:11 +0000 Subject: main/pidgin: moved form testing --- testing/pidgin/APKBUILD | 64 -------------------------------------------- testing/pidgin/msn_fix.patch | 28 ------------------- 2 files changed, 92 deletions(-) delete mode 100644 testing/pidgin/APKBUILD delete mode 100644 testing/pidgin/msn_fix.patch (limited to 'testing') diff --git a/testing/pidgin/APKBUILD b/testing/pidgin/APKBUILD deleted file mode 100644 index bff483fc0d..0000000000 --- a/testing/pidgin/APKBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=pidgin -pkgver=2.7.0 -pkgrel=1 -pkgdesc="graphical multi-protocol instant messaging client for X" -url="http://pidgin.im/" -license="GPL" -depends= -makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev - libxml2-dev gstreamer-dev libidn-dev dbus-glib-dev gnutls-dev - cyrus-sasl-dev ncurses-dev nss-dev" -subpackages="$pkgname-dev $pkgname-doc finch libpurple" -source="http://downloads.sourceforge.net/pidgin/$pkgver/pidgin-$pkgver.tar.bz2 - msn_fix.patch" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" - patch -Np0 -i ""$srcdir"/msn_fix.patch" || return 1 -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-avahi \ - --disable-doxygen \ - --disable-gnutls \ - --disable-meanwhile \ - --disable-nm \ - --disable-perl \ - --disable-schemas-install \ - --disable-screensaver \ - --disable-tcl \ - --disable-vv \ - --enable-cyrus-sasl \ - --enable-nss \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install -} - -finch() { - pkgdesc="text-based multi-protocol instant messaging client" - mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/lib/gnt "$pkgdir"/usr/lib/libgnt.so.* \ - "$pkgdir"/usr/lib/finch \ - "$subpkgdir"/usr/lib/ - mv "$pkgdir"/usr/bin/finch "$subpkgdir"/usr/bin/ -} - -libpurple() { - pkgdesc="multi-protocol instant messaging library" - mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share/sounds - mv "$pkgdir"/usr/lib/*purple* "$subpkgdir"/usr/lib/ - mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \ - "$subpkgdir"/usr/share/ -} -md5sums="63a36f91d29f5ac5a402ffd2d7dbbb72 pidgin-2.7.0.tar.bz2 -bbf9d6f6fc19342af7e059dc13432d27 msn_fix.patch" diff --git a/testing/pidgin/msn_fix.patch b/testing/pidgin/msn_fix.patch deleted file mode 100644 index f93fef8a45..0000000000 --- a/testing/pidgin/msn_fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -# -# -# patch "libpurple/protocols/msn/slplink.c" -# from [a96a53635871463de0177e5a99fe4ebdc2c7d577] -# to [87ada76abf90c44e615679efc5f8128bb941bba1] -# -============================================================ ---- libpurple/protocols/msn/slplink.c a96a53635871463de0177e5a99fe4ebdc2c7d577 -+++ libpurple/protocols/msn/slplink.c 87ada76abf90c44e615679efc5f8128bb941bba1 -@@ -383,6 +383,7 @@ msn_slplink_release_slpmsg(MsnSlpLink *s - msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) - { - MsnMessage *msg; -+ const char *passport; - - slpmsg->msg = msg = msn_message_new_msnslp(); - -@@ -421,7 +422,8 @@ msn_slplink_release_slpmsg(MsnSlpLink *s - - msg->msnslp_header.total_size = slpmsg->size; - -- msn_message_set_attr(msg, "P2P-Dest", slplink->remote_user); -+ passport = purple_normalize(slplink->session->account, slplink->remote_user); -+ msn_message_set_attr(msg, "P2P-Dest", passport); - - msg->ack_cb = msg_ack; - msg->nak_cb = msg_nak; - -- cgit v1.2.3 From f79aaa94c65bfb56e31e1d87f4df455119a0da44 Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Tue, 1 Jun 2010 09:07:12 +0000 Subject: testing/py-sqlite/: new aport --- testing/py-sqlite/APKBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 testing/py-sqlite/APKBUILD (limited to 'testing') diff --git a/testing/py-sqlite/APKBUILD b/testing/py-sqlite/APKBUILD new file mode 100644 index 0000000000..e5b87bd6c9 --- /dev/null +++ b/testing/py-sqlite/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Mika Havela +# Maintainer: Mika Havela +pkgname=py-sqlite +_realname=pysqlite +pkgver=2.6.0 +pkgrel=0 +pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" +url="http://code.google.com/p/pysqlite/" +license="MIT" +depends="python sqlite" +makedepends="sqlite-dev" +install= +source="http://pysqlite.googlecode.com/files/${_realname}-${pkgver}.tar.gz" + +_builddir="$srcdir"/$_realname-$pkgver + +build() { + exit 0 +} + +package() { + cd "$_builddir" + python setup.py install --root="$pkgdir" +} + +md5sums="fc92618b3b39d02e6ff10dc467c36640 pysqlite-2.6.0.tar.gz" -- cgit v1.2.3 From 4c8c16c5018dfdbfd6e5562c1dad613c69f376bf Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Tue, 1 Jun 2010 09:06:44 +0000 Subject: testing/py-genshi: new aport --- testing/py-genshi/APKBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 testing/py-genshi/APKBUILD (limited to 'testing') diff --git a/testing/py-genshi/APKBUILD b/testing/py-genshi/APKBUILD new file mode 100644 index 0000000000..d44a6f1930 --- /dev/null +++ b/testing/py-genshi/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Mika Havela +# Maintainer: Mika Havela +pkgname=py-genshi +_realname=Genshi +pkgver=0.6 +pkgrel=0 +pkgdesc="Python toolkit for stream-based generation of output for the web." +url="http://genshi.edgewall.org/" +license="BSD" +depends="python" +makedepends="py-setuptools" +install= +source="http://ftp.edgewall.com/pub/genshi/$_realname-$pkgver.tar.gz" + +_builddir="$srcdir"/$_realname-$pkgver + +build() { + exit 0 +} + +build() { + cd "$_builddir" + python setup.py install --root="$pkgdir" +} + +md5sums="604e8b23b4697655d36a69c2d8ef7187 Genshi-0.6.tar.gz" -- cgit v1.2.3 From 072ae34f42a5e333cccc6560afa1dc2abc0a7cdb Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Wed, 2 Jun 2010 13:17:41 +0000 Subject: testing/trac: Bumped version and created init.d and conf.d files --- testing/trac/APKBUILD | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 testing/trac/APKBUILD (limited to 'testing') diff --git a/testing/trac/APKBUILD b/testing/trac/APKBUILD new file mode 100644 index 0000000000..dd4a1f50d3 --- /dev/null +++ b/testing/trac/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Michael Mason +# Maintainer: Michael Mason +pkgname=trac +_realname=Trac +pkgver=0.11.7 +pkgrel=0 +pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." +url="http://trac.edgewall.com/" +license="GPL" +depends="python py-setuptools py-genshi py-sqlite" +makedepends="python-dev" +install= +source="ftp://ftp.edgewall.com/pub/$pkgname/$_realname-$pkgver.tar.gz + trac.confd + trac.initd" + +_builddir="$srcdir"/$_realname-$pkgver + +build() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" +} + +package() { + cd "$_builddir" + + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/${pkgname}d + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/${pkgname}d +} + +md5sums="3cd96dad0e4f25d977c422fd6e985e99 Trac-0.11.7.tar.gz +70609adb7403e7badae33f9f4fdc4bf3 trac.confd +66b91da45fbc5ab25ec2e0e7356020e2 trac.initd" -- cgit v1.2.3 From d075879097109f0bf9cff82772a16fc437e2ae47 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 2 Jun 2010 15:19:35 +0000 Subject: testing/py-sqlite: minor build fix --- testing/py-sqlite/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/py-sqlite/APKBUILD b/testing/py-sqlite/APKBUILD index e5b87bd6c9..a0ae27156a 100644 --- a/testing/py-sqlite/APKBUILD +++ b/testing/py-sqlite/APKBUILD @@ -8,14 +8,14 @@ pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational databa url="http://code.google.com/p/pysqlite/" license="MIT" depends="python sqlite" -makedepends="sqlite-dev" +makedepends="sqlite-dev python-dev" install= source="http://pysqlite.googlecode.com/files/${_realname}-${pkgver}.tar.gz" _builddir="$srcdir"/$_realname-$pkgver build() { - exit 0 + return 0 } package() { -- cgit v1.2.3 From 3edf3ebc166fa254cff28b42b8ceee936b8fd85f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 2 Jun 2010 15:20:00 +0000 Subject: testing/py-genshi: build fix. needs python-dev --- testing/py-genshi/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/py-genshi/APKBUILD b/testing/py-genshi/APKBUILD index d44a6f1930..461e285476 100644 --- a/testing/py-genshi/APKBUILD +++ b/testing/py-genshi/APKBUILD @@ -8,7 +8,7 @@ pkgdesc="Python toolkit for stream-based generation of output for the web." url="http://genshi.edgewall.org/" license="BSD" depends="python" -makedepends="py-setuptools" +makedepends="py-setuptools python-dev" install= source="http://ftp.edgewall.com/pub/genshi/$_realname-$pkgver.tar.gz" -- cgit v1.2.3 From 536ee480261049417d971463ad8d8b1c57fb7d79 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 2 Jun 2010 15:48:35 +0000 Subject: testing/trac: added missing initd and confd from gentoo --- testing/trac/APKBUILD | 12 ++++++------ testing/trac/tracd.confd | 13 +++++++++++++ testing/trac/tracd.initd | 27 +++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 testing/trac/tracd.confd create mode 100755 testing/trac/tracd.initd (limited to 'testing') diff --git a/testing/trac/APKBUILD b/testing/trac/APKBUILD index dd4a1f50d3..419fb6e2df 100644 --- a/testing/trac/APKBUILD +++ b/testing/trac/APKBUILD @@ -11,8 +11,8 @@ depends="python py-setuptools py-genshi py-sqlite" makedepends="python-dev" install= source="ftp://ftp.edgewall.com/pub/$pkgname/$_realname-$pkgver.tar.gz - trac.confd - trac.initd" + tracd.confd + tracd.initd" _builddir="$srcdir"/$_realname-$pkgver @@ -24,10 +24,10 @@ build() { package() { cd "$_builddir" - install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/${pkgname}d - install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/${pkgname}d + install -m755 -D "$srcdir"/tracd.initd "$pkgdir"/etc/init.d/tracd + install -m644 -D "$srcdir"/tracd.confd "$pkgdir"/etc/conf.d/tracd } md5sums="3cd96dad0e4f25d977c422fd6e985e99 Trac-0.11.7.tar.gz -70609adb7403e7badae33f9f4fdc4bf3 trac.confd -66b91da45fbc5ab25ec2e0e7356020e2 trac.initd" +95b1311ca65e1ffcd51a191542f45ba4 tracd.confd +e53761b1e84c5d68c8e6c4b837e57008 tracd.initd" diff --git a/testing/trac/tracd.confd b/testing/trac/tracd.confd new file mode 100644 index 0000000000..2cb9d292a7 --- /dev/null +++ b/testing/trac/tracd.confd @@ -0,0 +1,13 @@ +# The commented variables in this file are the defaults that are used +# in the init-script. You don't need to uncomment them except to +# customize them to different values. + +# Port for tracd +#TRACD_PORT="8000" + +# Options for tracd +#TRACD_OPTS="--env-parent-dir /var/lib/trac/" + +# User and group as which to run tracd +#TRACD_USER="tracd" +#TRACD_GROUP="tracd" diff --git a/testing/trac/tracd.initd b/testing/trac/tracd.initd new file mode 100755 index 0000000000..83f84052d3 --- /dev/null +++ b/testing/trac/tracd.initd @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.4 2010/05/28 14:43:40 arfrever Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting tracd" + # tracd fails to create pidfile if started as non-root user, thus we are asking + # s-s-d to do that. To have correct pid we avoid -d option of tracd and use + # --background option of s-s-d. + start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \ + --pidfile /var/run/tracd.pid --make-pidfile --background \ + --env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \ + --exec /usr/bin/python -- /usr/bin/tracd \ + -p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/} + eend $? +} + +stop() { + ebegin "Stopping tracd" + start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid + eend $? +} -- cgit v1.2.3 From 66f5b80eb38b6135f511102043627841b88a2782 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 3 Jun 2010 10:05:39 +0000 Subject: main/thunar-media-tags-plugin: moved from testing --- testing/thunar-media-tags-plugin/APKBUILD | 36 ------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 testing/thunar-media-tags-plugin/APKBUILD (limited to 'testing') diff --git a/testing/thunar-media-tags-plugin/APKBUILD b/testing/thunar-media-tags-plugin/APKBUILD deleted file mode 100644 index cbcb46ac39..0000000000 --- a/testing/thunar-media-tags-plugin/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: -# Maintainer: Natanael Copa -pkgname=thunar-media-tags-plugin -pkgver=0.1.2 -pkgrel=0 -pkgdesc="Media tags plugin for Thunar file manager" -url="http://thunar.xfce.org/pwiki/projects/thunar-media-tags-plugin" -license="GPL" -depends= -makedepends="thunar-dev taglib-dev" -install= -subpackages= -source="http://mocha.xfce.org/archive/src/thunar-plugins/thunar-media-tags-plugin/${pkgver%.*}/thunar-media-tags-plugin-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --disable-static - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install - rm -r "$pkgdir"/usr/lib/*/*.la -} - -md5sums="8a95f0ea4df6f757c1c94eb5442d2ff5 thunar-media-tags-plugin-0.1.2.tar.bz2" -- cgit v1.2.3 From 0963bf60e0ffaeaaaf08932f1a60c9006a414c7d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 3 Jun 2010 10:09:26 +0000 Subject: main/alsa-utils: moved from testing --- testing/alsa-utils/APKBUILD | 39 ------- testing/alsa-utils/alsa.confd | 31 ------ testing/alsa-utils/alsa.initd | 218 -------------------------------------- testing/alsa-utils/alsaconf.patch | 12 --- 4 files changed, 300 deletions(-) delete mode 100644 testing/alsa-utils/APKBUILD delete mode 100644 testing/alsa-utils/alsa.confd delete mode 100644 testing/alsa-utils/alsa.initd delete mode 100644 testing/alsa-utils/alsaconf.patch (limited to 'testing') diff --git a/testing/alsa-utils/APKBUILD b/testing/alsa-utils/APKBUILD deleted file mode 100644 index 8894a9cb72..0000000000 --- a/testing/alsa-utils/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=alsa-utils -pkgver=1.0.23 -pkgrel=0 -pkgdesc="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" -url="http://www.alsa-project.org" -license="GPL" -makedepends="alsa-lib-dev pciutils-dev ncurses-dev" -depends="dialog" -subpackages="$pkgname-doc" -source="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 - alsaconf.patch - alsa.initd - alsa.confd - " - -prepare() { - cd "$srcdir"/$pkgname-$pkgver - patch -Np1 -i ../alsaconf.patch || return 1 -} - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr \ - --disable-xmlto \ - || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -D -m755 ../alsa.initd "$pkgdir"/etc/init.d/alsa - install -D -m644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa -} -md5sums="cb0cf46029ac9549cf3a31bff6a4f4e1 alsa-utils-1.0.23.tar.bz2 -5e65f278b5a77e3ee2821ad955c4cd91 alsaconf.patch -4a66dad46d5366e05098cde97f3d37b5 alsa.initd -85b1f1e759fe5953eca329237f4ac256 alsa.confd" diff --git a/testing/alsa-utils/alsa.confd b/testing/alsa-utils/alsa.confd deleted file mode 100644 index 0a5d58fc1f..0000000000 --- a/testing/alsa-utils/alsa.confd +++ /dev/null @@ -1,31 +0,0 @@ -# ENABLE_OSS_EMUL: -# Do you want to enable in-kernel oss emulation? -# no - Do not load oss emul drivers -# yes - Load oss emul drivers if they're found - -ENABLE_OSS_EMUL="yes" - -# RESTORE_ON_START: -# Do you want to restore your mixer settings? If not, your cards will be -# muted. -# no - Do not restore state -# yes - Restore state - -RESTORE_ON_START="yes" - -# SAVE_ON_STOP: -# Do you want to save changes made to your mixer volumes when alsasound -# stops? -# no - Do not save state -# yes - Save state - -SAVE_ON_STOP="yes" - -# LOAD_ON_START: -# Do you want to load sound modules when alsasound starts? -# Note: The Gentoo ALSA developers encourage you to build your sound -# drivers into the kernel unless the device is hotpluggable or -# you need to supply specific options (such as model= to HD-Audio). -# no - Do not load modules -# yes - Load modules -LOAD_ON_START="yes" diff --git a/testing/alsa-utils/alsa.initd b/testing/alsa-utils/alsa.initd deleted file mode 100644 index c11861896f..0000000000 --- a/testing/alsa-utils/alsa.initd +++ /dev/null @@ -1,218 +0,0 @@ -#!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r4,v 1.1 2009/08/02 11:27:26 ssuominen Exp $ -# Copyright 2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -alsastatedir=/var/lib/alsa -alsascrdir=/etc/alsa.d - -opts="save restore" - -depend() { - need localmount - after bootmisc modules isapnp coldplug hotplug hwdrivers -} - -load_modules() { - # List of drivers for each card. - local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')" - - # Fall back on the automated aliases if we don't have ALSA configured properly... - if [ -z "${DRIVERS}" ] && \ - ( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then - ewarn "Could not detect custom ALSA settings. Loading all detected alsa drivers." - DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)" - if [ -z "${DRIVERS}" ] ; then - eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" - fi - fi - - if [ "${ENABLE_OSS_EMUL}" = "yes" ] ; then - DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.*oss/ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" - fi - - # We want to ensure snd-seq is loaded as it is needed for things like - # timidity even if we don't use a real sequencer. - DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.seq\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" - - # We want to ensure snd-ioctl32 is loaded as it is needed for 32bit - # compatibility - DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.ioctl32\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" - - local DRIVER= DMOD= - for DRIVER in ${DRIVERS} ; do - [ "${DRIVER}" = "off" ] && continue - DMOD="$(echo "${DRIVER}" | sed -e 's/-/_/g')" - if ! grep -q "^${DMOD} " /proc/modules ; then - ebegin "Loading: ${DRIVER}" - modprobe ${DRIVER} - eend $? - fi - done - - if [ -f /proc/asound/seq/drivers ] ; then - local SEQUENCERS="$(sed -n -e 's/\([^,]*\),empty,.*/\1/p' /proc/asound/seq/drivers)" - local SEQUENCER - for SEQUENCER in ${SEQUENCERS} ; do - DMOD="$(echo "${SEQUENCER}" | sed -e 's/-/_/g')" - if ! grep -q "^${DMOD} " /proc/modules ; then - ebegin "Loading: ${SEQUENCER}" - modprobe ${SEQUENCER} - eend $? - fi - done - fi - - for DRIVER in ${DRIVERS} - do - local TMP=${DRIVER##snd-} - TMP=${TMP##snd_} - if [ -x "${alsascrdir}/${TMP}" ] ; then - ebegin "Running: ${alsascrdir}/${TMP}" - "${alsascrdir}/${TMP}" - eend $? - fi - done - - if [ ! -d /proc/asound ] || grep -q ' no soundcards ' /proc/asound/cards ; then - eerror "ERROR: Failed to load necessary drivers" - return 1 - fi -} - -unload_modules_24() { - local LOADED_MODULES="$(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p')" - local MODULE - for MODULE in ${LOADED_MODULES} ; do - rmmod "${MODULE}" - done - rmmod soundcore 2>/dev/null - rmmod gameport 2>/dev/null - - lsmod | grep -vq '^snd' -} - -unload_modules_recursive() { - local revdeps="$(lsmod | sed -n -e "s/,/ /g" -e "s/^$1 *[0-9]* *[0-9]* \(.*\)/\1/p")" - - for module in ${revdeps} ; do - unload_modules_recursive "${module}" - done - - vebegin "Unloading: $1" - rmmod --wait "$1" - veend $? -} - -unload_modules_26() { - # First of all, remove the snd module and all the modules depending - # on it, this should remove already most of ALSA modules. - lsmod | grep -q "^snd[[:space:]]" && unload_modules_recursive snd - - # Then find the remaining ones, and handle them too. - for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do - unload_modules_recursive "${module}" - done - - lsmod | grep -vq "^snd" -} - -terminate() { - # - # Kill processes holding open sound devices - # - # DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*` - local ossdevs="/dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \ - /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi0* /dev/mixer* /dev/music \ - /dev/patmgr* /dev/sequencer* /dev/sndstat" - local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*" - fuser -k ${ossdevs} ${alsadevs} >/dev/null 2>/dev/null - - # remove all sequencer connections if any - [ -f /proc/asound/seq/clients ] && type aconnect >/dev/null 2>/dev/null && aconnect --removeall -} - -restore() { - ebegin "Restoring Mixer Levels" - - if [ ! -r "${alsastatedir}/asound.state" ] ; then - ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" - eend 0 - return 0 - fi - - local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" - local CARDNUM - for cardnum in ${cards}; do - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - alsactl -f "${alsastatedir}/asound.state" restore ${cardnum} \ - || ewarn "Errors while restoring defaults, ignoring" - done - - for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do - [ -e "${ossfile}" ] || continue - # We use cat because I'm not sure if cp works properly on /proc - local procfile=${ossfile##${alsastatedir}/oss} - procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" - if [ -e /proc/asound/"${procfile}"/oss ] ; then - cat "${ossfile}" > /proc/asound/"${procfile}"/oss - fi - done - - eend 0 -} - -save() { - ebegin "Storing ALSA Mixer Levels" - - mkdir -p "${alsastatedir}" - if ! alsactl -f "${alsastatedir}/asound.state" store; then - eerror "Error saving levels." - eend 1 - return 1 - fi - - for ossfile in /proc/asound/card*/pcm*/oss; do - [ -e "${ossfile}" ] || continue - local device=${ossfile##/proc/asound/} ; device=${device%%/oss} - device="$(echo "${device}" | sed -e 's,/,_,g')" - mkdir -p "${alsastatedir}/oss/" - cp "${ossfile}" "${alsastatedir}/oss/${device}" - done - - eend 0 -} - -start() { - if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then - ebegin "Loading ALSA modules" - eindent - load_modules - eoutdent - eend $? || return 1 - fi - - if [ ! -d /proc/asound ]; then - eerror "ALSA failed to load." - eend 1 - return 1 - elif [ "${RESTORE_ON_START}" = "yes" ]; then - restore - fi - - return 0 -} - -stop() { - if [ ! -d /proc/asound ] ; then - eerror "ALSA is not loaded" - return 0 - fi - - [ "${SAVE_ON_STOP}" = "yes" ] && save - - return 0 -} diff --git a/testing/alsa-utils/alsaconf.patch b/testing/alsa-utils/alsaconf.patch deleted file mode 100644 index 846cf98480..0000000000 --- a/testing/alsa-utils/alsaconf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in ---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2005-03-24 00:24:52.000000000 -0800 -+++ alsa-utils-1.0.9a/alsaconf/alsaconf.in 2005-07-18 09:25:02.000000000 -0700 -@@ -58,6 +58,8 @@ - distribution="redhat" - elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then - distribution="fedora" -+elif test -f /etc/alpine-release; then -+ distribution="alpine" - elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then - distribution="slackware" - else -- cgit v1.2.3 From 5f5e39ae8a8f7773ea231e2db4b8c0070874d8b0 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 3 Jun 2010 12:42:17 +0000 Subject: testing/kamailio: upgrade to 3.0.2 --- testing/kamailio/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index fff2908231..aee29ffc05 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason # Maintainer: Natanael Copa pkgname=kamailio -pkgver=3.0.1 -pkgrel=1 +pkgver=3.0.2 +pkgrel=0 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" @@ -144,7 +144,7 @@ unixodbc() { _mv_mod_k db_unixodbc } -md5sums="c0e488ab240f9a4668c10068e3fb2cae kamailio-3.0.1_src.tar.gz +md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz eb665248ee39cf755a247286affc5cbb kamailio.cfg 81100c479890a2a8c2628db22fdd1a0c kamailio.initd c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install -- cgit v1.2.3 From fb822c4e034441a21a083102b59c9510ce8f5c0d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 3 Jun 2010 13:08:00 +0000 Subject: main/ltrace: moved from testing --- testing/ltrace/APKBUILD | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 testing/ltrace/APKBUILD (limited to 'testing') diff --git a/testing/ltrace/APKBUILD b/testing/ltrace/APKBUILD deleted file mode 100644 index 145c2a5454..0000000000 --- a/testing/ltrace/APKBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=ltrace -pkgver=0.5.3 -pkgrel=0 -pkgdesc="Tracks runtime library calls in dynamically linked programs" -url="http://ltrace.alioth.debian.org/" -license="GPL" -depends= -makedepends="libelf-dev" -subpackages="$pkgname-doc" -source="http://ftp.debian.org/debian/pool/main/l/$pkgname/${pkgname}_$pkgver.orig.tar.gz" - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - || return 1 - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make install DESTDIR="$pkgdir" || return 1 -} -md5sums="3fa7fe715ab879db08bd06d1d59fd90f ltrace_0.5.3.orig.tar.gz" -- cgit v1.2.3 From f48632069e0bee30cf4c9a4d2c443900062fc767 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 3 Jun 2010 13:08:46 +0000 Subject: main/libelf: moved from testing --- testing/libelf/APKBUILD | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 testing/libelf/APKBUILD (limited to 'testing') diff --git a/testing/libelf/APKBUILD b/testing/libelf/APKBUILD deleted file mode 100644 index 88a52258bc..0000000000 --- a/testing/libelf/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=libelf -pkgver=0.8.13 -pkgrel=0 -pkgdesc="libelf is a free ELF object file access library" -url="http://www.mr511.de/software/" -license="GPL" -depends= -makedepends= -subpackages="$pkgname-dev" -source="http://www.mr511.de/software/$pkgname-$pkgver.tar.gz" - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-shared \ - --enable-gnu-names \ - --enable-compat || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make install prefix="$pkgdir"/usr || return 1 -} -md5sums="4136d7b4c04df68b686570afa26988ac libelf-0.8.13.tar.gz" -- cgit v1.2.3 From 8d7190c2c9b5628b8c80d2c636cc151ecc2432f3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 06:51:50 +0000 Subject: main/nagios: moved from testing --- testing/nagios/APKBUILD | 59 ------------------------------------- testing/nagios/lighttpd-nagios.conf | 29 ------------------ testing/nagios/nagios.confd | 9 ------ testing/nagios/nagios.initd | 39 ------------------------ 4 files changed, 136 deletions(-) delete mode 100644 testing/nagios/APKBUILD delete mode 100644 testing/nagios/lighttpd-nagios.conf delete mode 100644 testing/nagios/nagios.confd delete mode 100644 testing/nagios/nagios.initd (limited to 'testing') diff --git a/testing/nagios/APKBUILD b/testing/nagios/APKBUILD deleted file mode 100644 index 1bde07a882..0000000000 --- a/testing/nagios/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Contributor: Carlo Landmeter -# Maintainer: Carlo Landmeter -pkgname=nagios -pkgver=3.2.1 -pkgrel=0 -pkgdesc="Popular monitoring tool" -url="http://www.nagios.org/" -license="GPL-2" -depends="perl" -makedepends="gd-dev pkgconfig perl-dev" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz -nagios.confd -nagios.initd -lighttpd-nagios.conf" -subpackages="${pkgname}-web" - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr \ - --sysconfdir=/etc/nagios \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share/nagios \ - --localstatedir=/var \ - --bindir=/usr/sbin \ - --sbindir=/usr/lib/nagios/cgi-bin \ - --datadir=/usr/share/nagios/htdocs \ - --libexecdir=/usr/lib/nagios/plugins \ - --localstatedir=/var/nagios \ - --with-nagios-user=nobody \ - --with-nagios-group=nobody \ - --enable-embedded-perl \ - --with-perlcache - make all || return 1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" install-config - make DESTDIR="$pkgdir" install-commandmode - - install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname -} - - -web() { - #depends="php lighttpd" - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/share "$subpkgdir"/usr/ - install -m644 -D "$srcdir"/lighttpd-nagios.conf "$subpkgdir"/etc/lighttpd-nagios.conf -} - -md5sums="d4655ee8c95c9679fd4fd53dac34bbe3 nagios-3.2.1.tar.gz -431dfe7403323e247a88b97beade5d78 nagios.confd -2ead8695b32222abe922692664aa9de1 nagios.initd -d63c36f47d26f1f71ae2faf272eec640 lighttpd-nagios.conf" diff --git a/testing/nagios/lighttpd-nagios.conf b/testing/nagios/lighttpd-nagios.conf deleted file mode 100644 index cb7081d841..0000000000 --- a/testing/nagios/lighttpd-nagios.conf +++ /dev/null @@ -1,29 +0,0 @@ -### -# Sample nagios lighttpd config -### - -server.modules += ("mod_cgi") -server.modules += ("mod_auth") -server.modules += ("mod_alias") - -auth.require += ( "/nagios" => - ( - "method" => "digest", - "realm" => "nagios", - "require" => "valid-user" - ) -) - -$HTTP["url"] =~ "^/nagios/cgi-bin/" { - dir-listing.activate = "disable" - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "" - ) -} - -alias.url += ( - "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin", - "/nagios" => "/usr/share/nagios/htdocs" -) - diff --git a/testing/nagios/nagios.confd b/testing/nagios/nagios.confd deleted file mode 100644 index 0abb80c6e8..0000000000 --- a/testing/nagios/nagios.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Sample conf.d file for alpine linux - -# -# Specify daemon $OPTS here. -# - -OPTS="" -USER="nobody" -GROUP="nobody" diff --git a/testing/nagios/nagios.initd b/testing/nagios/nagios.initd deleted file mode 100644 index e0b3bcf0c3..0000000000 --- a/testing/nagios/nagios.initd +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/runscript - -# Sample init.d file for alpine linux. - -NAME=nagios -DAEMON=/usr/sbin/$NAME - -depend() { - need net - after firewall -} - -start() { - ebegin "Starting ${NAME}" - start-stop-daemon --start --quiet --background \ - --make-pidfile --pidfile /var/run/${NAME}.pid \ - --exec ${DAEMON} -- ${OPTS} /etc/nagios/nagios.cfg - eend $? -} - -stop() { - ebegin "Stopping ${NAME}" - start-stop-daemon --stop --quiet \ - --exec ${DAEMON} \ - --pidfile /var/run/${NAME}.pid \ - eend $? -} - -reload() { - ebegin "Reloading ${NAME}" - if ! service_started "${NAME}" ; then - eend 1 "${NAME} is not started" - return 1 - fi - start-stop-daemon --stop --oknodo --signal HUP \ - --exec ${DAEMON} --pidfile /var/run/${NAME}.pid - eend $? -} - -- cgit v1.2.3 From 8e4374c90db7301aaaa254de1dd3dab4e288385f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 06:56:06 +0000 Subject: main/geh: moved from testing --- testing/geh/APKBUILD | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 testing/geh/APKBUILD (limited to 'testing') diff --git a/testing/geh/APKBUILD b/testing/geh/APKBUILD deleted file mode 100644 index 4f768bdaa6..0000000000 --- a/testing/geh/APKBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Contributor: -# Maintainer: -pkgname=geh -pkgver=0.2.0 -pkgrel=0 -pkgdesc="a simple commandline image viewer written in C/Gtk+" -url="https://projects.pekdon.net/projects/geh" -license="GPL" -depends= -makedepends="gtk+-dev intltool" -install= -subpackages="$pkgname-doc" -source="http://projects.pekdon.net/projects/geh/files/geh-$pkgver.tar.gz" - -# append extra dependencies to -dev subpackage -# remove if not used. -# depends_dev="somepackage-dev" - -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" - # apply patches here -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install - - # remove the 2 lines below (and this) if there is no init.d script - # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname -} - -md5sums="2349b774e7f0c288061fcfc8c296f20d geh-0.2.0.tar.gz" -- cgit v1.2.3 From 20fd5f43c3f00b987a2f59890a45643f628393a3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 10:07:11 +0000 Subject: removed bogus file --- testing/needbump | 57 -------------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 testing/needbump (limited to 'testing') diff --git a/testing/needbump b/testing/needbump deleted file mode 100644 index 66f21c4703..0000000000 --- a/testing/needbump +++ /dev/null @@ -1,57 +0,0 @@ -alsa-utils -bacula -bacula-client -cherokee -collectd -cryptsetup -daemontools -dspam -ebtables -fuse -gtksourceview -hardinfo -hdparm -hping3 -icecast -iproute2 -ircii -ircservices -iscsi-scst -kamailio -libgssglue -libtirpc -libunique -libwmf -live-media -lua-crypto -lua-curl -lua-filesystem -lua-nixio -lua-rexlib -madplay -madwimax -mediaproxy -mplayer -mtx -open-iscsi -osmo -pmacct -pptpclient -prosody -psqlodbc -python-cjson -python-gnutls -qemu -rrdbot -rtapd -rtnppd -sems -sircbot -sisctrl -smartmontools -swish-e -ucspi-tcp -udev -umix -wine - -- cgit v1.2.3 From a8e34c5d98e0ad8643ff91b174e93f059902777e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:01:56 +0000 Subject: main/umix: moved from testing --- testing/umix/APKBUILD | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 testing/umix/APKBUILD (limited to 'testing') diff --git a/testing/umix/APKBUILD b/testing/umix/APKBUILD deleted file mode 100644 index d057b39081..0000000000 --- a/testing/umix/APKBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Michael Mason -# Maintainer: Michael Mason -pkgname=umix -pkgver=1.0.2 -pkgrel=1 -pkgdesc="Program for adjusting soundcard volumes" -url="http://umix.sf.net" -license="GPL" -depends= -makedepends="ncurses-dev" -install= -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -md5sums="e38fc288273cc8b5b34f8769f06b32ee umix-1.0.2.tar.gz" -- cgit v1.2.3 From c9bcb2b4add263c396df95b52fafcb7a459ead74 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:05:24 +0000 Subject: main/cryptosetup: moved from testing --- testing/cryptsetup/APKBUILD | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 testing/cryptsetup/APKBUILD (limited to 'testing') diff --git a/testing/cryptsetup/APKBUILD b/testing/cryptsetup/APKBUILD deleted file mode 100644 index 887d15d3ed..0000000000 --- a/testing/cryptsetup/APKBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=cryptsetup -pkgver=1.1.0 -pkgrel=0 -pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" -url="http://code.google.com/p/cryptsetup/" -license="GPL" -depends= -makedepends="lvm2-dev libgcrypt-dev popt-dev util-linux-ng-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2" - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr \ - --disable-static \ - || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} -md5sums="8177f1833f4d6aaacc5812046d2010b6 cryptsetup-1.1.0.tar.bz2" -- cgit v1.2.3 From 44e7f79e382c6ed69511972c3b271f1945780344 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:06:06 +0000 Subject: main/ferm: moved from testing --- testing/ferm/APKBUILD | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 testing/ferm/APKBUILD (limited to 'testing') diff --git a/testing/ferm/APKBUILD b/testing/ferm/APKBUILD deleted file mode 100644 index b6710399ac..0000000000 --- a/testing/ferm/APKBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Contributor: Michael Mason -# Maintainer: Michael Mason -pkgname=ferm -pkgver=2.0.5 -pkgrel=0 -pkgdesc="firewall configuration tool" -url="http://ferm.foo-projects.org/" -license="GPL" -depends="perl iptables" -makedepends="" -install= -subpackages="" -source="http://ferm.foo-projects.org/download/2.0/$pkgname-$pkgver.tar.gz" - -build() { - cd "$srcdir/$pkgname-$pkgver" - - install -m755 -D "$srcdir"/"$pkgname-$pkgver"/src/ferm "$pkgdir"/usr/sbin/"$pkgname" - install -m755 -D "$srcdir"/"$pkgname-$pkgver"/src/import-ferm "$pkgdir"/usr/sbin/import-ferm -} - -md5sums="e77db05360877299cb6fa8c5b51a5e77 ferm-2.0.5.tar.gz" -- cgit v1.2.3 From bdf4a9e7022c840459877bd34eebd148c48ae3e0 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:12:29 +0000 Subject: main/gnumeric: moved from testing --- testing/gnumeric/APKBUILD | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 testing/gnumeric/APKBUILD (limited to 'testing') diff --git a/testing/gnumeric/APKBUILD b/testing/gnumeric/APKBUILD deleted file mode 100644 index ef7d620a46..0000000000 --- a/testing/gnumeric/APKBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=gnumeric -pkgver=1.10.3 -pkgrel=0 -pkgdesc="A GNOME Spreadsheet Program" -url="http://www.gnome.org/projects/gnumeric/" -license="GPL" -makedepends="gtk+-dev intltool desktop-file-utils libglade-dev goffice-dev - rarian" -install= -subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.10/$pkgname-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-schemas-install \ - --disable-static \ - --enable-ssindex || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 -} -md5sums="7da8b0acac1395c6fb049d5be7da37ef gnumeric-1.10.3.tar.bz2" -- cgit v1.2.3 From 75eab2eb6e6285a00783d45546bb59b85a7bae42 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:22:22 +0000 Subject: testing/ebtables: install the correct conf.d file --- testing/ebtables/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/ebtables/APKBUILD b/testing/ebtables/APKBUILD index aedc6e8a48..b92839eb25 100644 --- a/testing/ebtables/APKBUILD +++ b/testing/ebtables/APKBUILD @@ -3,7 +3,7 @@ pkgname=ebtables pkgver=2.0.9.1 _realver=v2.0.9-1 -pkgrel=1 +pkgrel=2 pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge." url="http://ebtables.sourceforge.net/" license="GPL" @@ -49,7 +49,7 @@ package() { cd "$srcdir"/$pkgname-$_realver make DESTDIR="$pkgdir" install install -D -m755 ../ebtables.initd "$pkgdir"/etc/init.d/ebtables - install -D -m644 ../ebtables.initd "$pkgdir"/etc/conf.d/ebtables + install -D -m644 ../ebtables.confd "$pkgdir"/etc/conf.d/ebtables } md5sums="0e0c20adf2bba6d91dbd0b74a1a38c33 ebtables-v2.0.9-1.tar.gz -- cgit v1.2.3 From d50d33e52fad33834f91c76ec5409311266eb74b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:23:12 +0000 Subject: main/osmo: moved from testing --- testing/osmo/APKBUILD | 38 --------------------------------- testing/osmo/osmo-0.2.10-build-mo.patch | 20 ----------------- 2 files changed, 58 deletions(-) delete mode 100644 testing/osmo/APKBUILD delete mode 100644 testing/osmo/osmo-0.2.10-build-mo.patch (limited to 'testing') diff --git a/testing/osmo/APKBUILD b/testing/osmo/APKBUILD deleted file mode 100644 index 1413096803..0000000000 --- a/testing/osmo/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=osmo -pkgver=0.2.10 -pkgrel=1 -pkgdesc="A handy personal organizer" -url="http://clayo.org/osmo/" -license="GPL" -makedepends="gtk+-dev libnotify-dev libical-dev libxml2-dev autoconf automake" -install= -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname-pim/$pkgname-$pkgver.tar.gz - osmo-0.2.10-build-mo.patch - " - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" - for i in "$srcdir"/*.patch; do - msg "Applying ${i##*/}" - patch -p1 -i "$i" || return 1 - done - aclocal && autoconf && automake -} - -build() { - cd "$_builddir" - CFLAGS="$CFLAGS -I/usr/include/libical" - ./configure --prefix=/usr || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 -} - -md5sums="a774db748228efee96186158d553ade9 osmo-0.2.10.tar.gz -6c9939fd4df9d25e1a220585e6875c78 osmo-0.2.10-build-mo.patch" diff --git a/testing/osmo/osmo-0.2.10-build-mo.patch b/testing/osmo/osmo-0.2.10-build-mo.patch deleted file mode 100644 index ac1b9aa235..0000000000 --- a/testing/osmo/osmo-0.2.10-build-mo.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/po/Makefile.am b/po/Makefile.am -index b3c904a..f0ee467 100644 ---- a/po/Makefile.am -+++ b/po/Makefile.am -@@ -16,8 +16,8 @@ all: $(MOFILES) - - update-po: $(DOMAIN).pot $(POFILES) $(MOFILES) - --%.mo: skip -- @po=$(@:.mo=.po); if test $$po -nt $@ ; then $(MSGFMT) -c --statistics $$po -o $@; echo "$@ updated."; fi -+%.mo: %.po -+ @$(MSGFMT) -c --statistics $^ -o $@; echo "$@ updated." - - %.po: $(DOMAIN).pot - $(MSGMERGE) $@ $< -o $@.in && mv $@.in $@ -@@ -41,4 +41,3 @@ uninstall-local: - clean-local: - rm -rf *.mo - --skip: -- cgit v1.2.3 From 02b98fac8163ea4d1d3b6ccf364838b69fe23046 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:25:03 +0000 Subject: main/ttf-linux-libertine: moved from testing --- testing/ttf-linux-libertine/APKBUILD | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 testing/ttf-linux-libertine/APKBUILD (limited to 'testing') diff --git a/testing/ttf-linux-libertine/APKBUILD b/testing/ttf-linux-libertine/APKBUILD deleted file mode 100644 index 2837358cd2..0000000000 --- a/testing/ttf-linux-libertine/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=ttf-linux-libertine -pkgver=4.4.1 -pkgrel=0 -pkgdesc="Serif (Libertine) and Sans Serif (Biolinum) OpenType fonts with large Unicode coverage" -url="http://linuxlibertine.sourceforge.net/" -license="GPL custom:OFL" -makedepends= -depends="fontconfig encodings mkfontdir mkfontscale" -install= -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/sourceforge/linuxlibertine/LinLibertineFont-$pkgver.tgz" - -build () { - local f - # strip off the version numbers from the filenames. - cd "$srcdir"/LinLibertineFont - for f in *.ttf; do - mv $f ${f%-[0-9]*}.ttf - done - for f in *.otf; do - mv $f ${f%-[0-9]*}.otf - done -} - -package() { - cd "$srcdir"/LinLibertineFont - install -d -m 755 "$pkgdir"/usr/share/fonts/OTF \ - "$pkgdir"/usr/share/fonts/TTF - install -m644 *.ttf "$pkgdir"/usr/share/fonts/TTF || return 1 - install -m644 *.otf "$pkgdir"/usr/share/fonts/OTF || return 1 - install -D -m644 OFL.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1 - install -D -m644 LICENCE.txt "$pkgdir"/usr/share/licenses/$pkgname/README || return 1 -} -md5sums="297f537b31693c92c1aceaa0aeccb115 LinLibertineFont-4.4.1.tgz" -- cgit v1.2.3 From b54ccd7ad929b24a01a6e7e0500958bb8f589665 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:28:26 +0000 Subject: main/ebtables: moved from testing --- testing/ebtables/0001-link-with-gcc.patch | 25 -------- testing/ebtables/APKBUILD | 58 ------------------ testing/ebtables/ebtables.confd | 15 ----- testing/ebtables/ebtables.initd | 97 ------------------------------- 4 files changed, 195 deletions(-) delete mode 100644 testing/ebtables/0001-link-with-gcc.patch delete mode 100644 testing/ebtables/APKBUILD delete mode 100644 testing/ebtables/ebtables.confd delete mode 100644 testing/ebtables/ebtables.initd (limited to 'testing') diff --git a/testing/ebtables/0001-link-with-gcc.patch b/testing/ebtables/0001-link-with-gcc.patch deleted file mode 100644 index 88aba09f3f..0000000000 --- a/testing/ebtables/0001-link-with-gcc.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/Makefile Sun Jun 21 13:13:25 2009 -+++ b/Makefile Wed Oct 28 02:42:43 2009 -@@ -85,7 +85,7 @@ - - .PHONY: libebtc - libebtc: $(OBJECTS2) -- $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2) -+ $(CC) -shared -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2) - - ebtables: $(OBJECTS) ebtables-standalone.o libebtc - $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ -@@ -153,10 +153,13 @@ - tmp3:=$(shell printf $(PIPE) | sed 's/\//\\\//g') - .PHONY: scripts - scripts: ebtables-save ebtables.sysv ebtables-config -+ mkdir -p $(DESTDIR)$(BINDIR) - cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ - install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save -+ mkdir -p $(DESTDIR)$(INITDIR) - cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ - install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables -+ mkdir -p $(DESTDIR)$(SYSCONFIGDIR) - cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ - install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config - rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ diff --git a/testing/ebtables/APKBUILD b/testing/ebtables/APKBUILD deleted file mode 100644 index b92839eb25..0000000000 --- a/testing/ebtables/APKBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Contributor: Andrew Manison -# Maintainer: Natanael Copa -pkgname=ebtables -pkgver=2.0.9.1 -_realver=v2.0.9-1 -pkgrel=2 -pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge." -url="http://ebtables.sourceforge.net/" -license="GPL" -depends= -makedepends= -install= -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_realver.tar.gz - 0001-link-with-gcc.patch - ebtables.initd - ebtables.confd" - -prepare() { - cd "$srcdir"/$pkgname-$_realver - # patches - for i in ../*.patch; do - msg "Applying $i" - if ! patch --verbose -p1 -i $i; then - error "$i failed" - return 1 - fi - done - - sed -i -e "s,^MANDIR:=.*,MANDIR:=/usr/share/man," \ - -e "s,^BINDIR:=.*,BINDIR:=/sbin," \ - -e "s,^INITDIR:=.*,INITDIR:=/usr/share/doc/ebtables," \ - -e "s,^SYSCONFIGDIR:=.*,SYSCONFIGDIR:=/usr/share/doc/ebtables,"\ - -e "s,^LIBDIR:=.*,LIBDIR:=/usr/lib/\$(PROGNAME)," \ - -e "s/^CFLAGS:=/CFLAGS+=/" \ - -e "s,^CC:=,CC?=," Makefile -} - -build() { - cd "$srcdir"/$pkgname-$_realver - - # This package uses _init functions to initialise extensions. With - # --as-needed this will not work. - export LDFLAGS="$LDFLAGS -Wl,--no-as-needed" - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$_realver - make DESTDIR="$pkgdir" install - install -D -m755 ../ebtables.initd "$pkgdir"/etc/init.d/ebtables - install -D -m644 ../ebtables.confd "$pkgdir"/etc/conf.d/ebtables -} - -md5sums="0e0c20adf2bba6d91dbd0b74a1a38c33 ebtables-v2.0.9-1.tar.gz -91a565a5906dc1fd4103f03c6a88e0e1 0001-link-with-gcc.patch -92e13b3bc1d47d7c00636ebb78c905d5 ebtables.initd -285089ba2d846e72e321a12e3da3cc96 ebtables.confd" diff --git a/testing/ebtables/ebtables.confd b/testing/ebtables/ebtables.confd deleted file mode 100644 index db46ffb587..0000000000 --- a/testing/ebtables/ebtables.confd +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/conf.d/ebtables - -# Location in which ebtables initscript will save set rules on -# service shutdown -EBTABLES_SAVE="/var/lib/ebtables/rules-save" - -# Options to pass to ebtables-save and ebtables-restore -SAVE_RESTORE_OPTIONS="" - -# Save state on stopping ebtables -SAVE_ON_STOP="yes" - -# Tables to be saved and restored. If you have built ebtables as modules, you -# may leave it blank. Otherwise, you MUST define which to control. -TABLE_NAMES="filter nat broute" diff --git a/testing/ebtables/ebtables.initd b/testing/ebtables/ebtables.initd deleted file mode 100644 index 27c743c910..0000000000 --- a/testing/ebtables/ebtables.initd +++ /dev/null @@ -1,97 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/files/ebtables.initd,v 1.2 2007/09/28 19:22:14 pva Exp $ - -opts="save reload panic" - -ebtables_bin="/sbin/ebtables" -ebtables_save=${EBTABLES_SAVE} -ebtables_tables=$(grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//) -if [ "$ebtables_tables" == "" ] ; then - ebtables_tables=${TABLE_NAMES} -fi - -depend() { - before net - use logger -} - -set_table_policy() { - local chains table=$1 policy=$2 - case ${table} in - nat) chains="PREROUTING POSTROUTING OUTPUT";; - broute) chains="BROUTING";; - filter) chains="INPUT FORWARD OUTPUT";; - *) chains="";; - esac - local chain - for chain in ${chains} ; do - ${ebtables_bin} -t ${table} -P ${chain} ${policy} - done -} - -checkconfig() { - if [ ! -f ${ebtables_save} ] ; then - eerror "Not starting ebtables. First create some rules then run:" - eerror "/etc/init.d/ebtables save" - return 1 - fi - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Loading ebtables state and starting bridge firewall" - ${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}" - eend $? -} - -stop() { - if [ "${SAVE_ON_STOP}" = "yes" ] ; then - save || return 1 - fi - ebegin "Stopping bridge firewall" - local a - for a in ${ebtables_tables}; do - set_table_policy $a ACCEPT - - ${ebtables_bin} -t $a -F - ${ebtables_bin} -t $a -X - done - eend $? -} - -reload() { - ebegin "Flushing bridge firewall" - local a - for a in ${ebtables_tables}; do - ${ebtables_bin} -t $a -F - ${ebtables_bin} -t $a -X - done - eend $? - - start -} - -save() { - ebegin "Saving ebtables state" - touch "${ebtables_save}" - chmod 0600 "${ebtables_save}" - ${ebtables_bin}-save ${ebtables_tables} ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}" - eend $? -} - -panic() { - service_started ebtables && svc_stop - - local a - ebegin "Dropping all packets forwarded on bridges" - for a in ${ebtables_tables}; do - ${ebtables_bin} -t $a -F - ${ebtables_bin} -t $a -X - - set_table_policy $a DROP - done - eend $? -} -- cgit v1.2.3 From 896b6b9e585e1d182539a8e50ff8888cae296874 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:31:17 +0000 Subject: testing/lua-stdlib: upgrade to 13 --- testing/lua-stdlib/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/lua-stdlib/APKBUILD b/testing/lua-stdlib/APKBUILD index e0f459d867..9d9f5a0214 100644 --- a/testing/lua-stdlib/APKBUILD +++ b/testing/lua-stdlib/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natnae pkgname=lua-stdlib -pkgver=12 +pkgver=13 pkgrel=0 pkgdesc="Lua library of modules for common programming tasks" url="http://luaforge.net/projects/stdlib/" @@ -9,7 +9,7 @@ depends= makedepends= install= subpackages="$pkgname-doc" -source="http://luaforge.net/frs/download.php/4232/stdlib-12.tar.gz" +source="http://luaforge.net/frs/download.php/4581/stdlib-13.tar.gz" _builddir="$srcdir"/stdlib _luashare=/usr/share/lua/5.1 @@ -25,4 +25,4 @@ package() { install -m644 modules/*.html "$pkgdir"/usr/share/doc/$pkgname/ } -md5sums="34b07fde9931279d265f23492a22483b stdlib-12.tar.gz" +md5sums="592cbfb622a0a9a7d8c6d7ca6657bc05 stdlib-13.tar.gz" -- cgit v1.2.3 From 4ea8e8dad5a1f33af3b810ec6c2dbec9eab2bb92 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:36:20 +0000 Subject: main/lua-stdlib: moved form testing --- testing/lua-stdlib/APKBUILD | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 testing/lua-stdlib/APKBUILD (limited to 'testing') diff --git a/testing/lua-stdlib/APKBUILD b/testing/lua-stdlib/APKBUILD deleted file mode 100644 index 9d9f5a0214..0000000000 --- a/testing/lua-stdlib/APKBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Natnae -pkgname=lua-stdlib -pkgver=13 -pkgrel=0 -pkgdesc="Lua library of modules for common programming tasks" -url="http://luaforge.net/projects/stdlib/" -license="MIT/X" -depends= -makedepends= -install= -subpackages="$pkgname-doc" -source="http://luaforge.net/frs/download.php/4581/stdlib-13.tar.gz" - -_builddir="$srcdir"/stdlib -_luashare=/usr/share/lua/5.1 -build() { - cd "$_builddir" -} - -package() { - cd "$_builddir" - install -d "$pkgdir"/$_luashare - install -m644 modules/*.lua "$pkgdir"/$_luashare/ - mkdir -p "$pkgdir"/usr/share/doc/$pkgname - install -m644 modules/*.html "$pkgdir"/usr/share/doc/$pkgname/ -} - -md5sums="592cbfb622a0a9a7d8c6d7ca6657bc05 stdlib-13.tar.gz" -- cgit v1.2.3 From dbc7dc3e04872ed80cec6cbe76ebe628ac0b1672 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:50:26 +0000 Subject: main/libical: moved from testing --- testing/libical/APKBUILD | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 testing/libical/APKBUILD (limited to 'testing') diff --git a/testing/libical/APKBUILD b/testing/libical/APKBUILD deleted file mode 100644 index 22ef967848..0000000000 --- a/testing/libical/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=libical -pkgver=0.44 -pkgrel=0 -pkgdesc="An open source reference implementation of the icalendar data type and serialization format" -url="http://sourceforge.net/projects/freeassociation/" -license="LGPL MPL" -depends= -makedepends="perl" -subpackages="$pkgname-dev" -source="http://downloads.sourceforge.net/freeassociation/$pkgname-$pkgver.tar.gz" - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-shared \ - --disable-static \ - || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} -md5sums="e0403c31e1ed82569325685f8c15959c libical-0.44.tar.gz" -- cgit v1.2.3 From 902c017c496b99c2383806c38fed08f76e3ab7b9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:52:36 +0000 Subject: main/gtkspell: moved from testing Used by pidgin --- testing/gtkspell/APKBUILD | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 testing/gtkspell/APKBUILD (limited to 'testing') diff --git a/testing/gtkspell/APKBUILD b/testing/gtkspell/APKBUILD deleted file mode 100644 index 7e8d2a1dcc..0000000000 --- a/testing/gtkspell/APKBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=gtkspell -pkgver=2.0.16 -pkgrel=0 -pkgdesc="GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget" -url="http://gtkspell.sourceforge.net/" -license="GPL" -makedepends="gtk+-dev enchant-dev intltool" -subpackages="$pkgname-dev $pkgname-doc" -source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz" - -depends_dev="gtk+-dev" -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr \ - || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install || return 1 -} -md5sums="f75dcc9338f182c571b321d37c606a94 gtkspell-2.0.16.tar.gz" -- cgit v1.2.3 From e34f311f0382f1a04aa28ceab6c7773f568dd3e3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 4 Jun 2010 21:54:19 +0000 Subject: testing/kqemu-grsec: removed. does not work --- testing/kqemu-grsec/APKBUILD | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 testing/kqemu-grsec/APKBUILD (limited to 'testing') diff --git a/testing/kqemu-grsec/APKBUILD b/testing/kqemu-grsec/APKBUILD deleted file mode 100644 index 66a0ea09dd..0000000000 --- a/testing/kqemu-grsec/APKBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Natanael Copa - -_flavor=grsec -_realname=kqemu -# source the kernel version -if [ -f ../../main/linux-$_flavor/APKBUILD ]; then - . ../../main/linux-$_flavor/APKBUILD -fi -_kernelver=$pkgver-r$pkgrel -_abi_release=$pkgver-${_flavor} -_kpkgrel=$pkgrel - -pkgname=${_realname}-${_flavor} -pkgver=$pkgver -_realver=1.4.0pre1 -_mypkgrel=0 -pkgrel=$(($_kpkgrel + $_mypkgrel)) -pkgdesc="$_flavor kernel modules for kemu $_realver" -url="http://www.nongnu.org/qemu/" -license="GPL" -depends="linux-${_flavor}=${_kernelver}" -install= -makedepends="linux-${_flavor}-dev=${_kernelver}" -subpackages= -source="http://www.nongnu.org/qemu/kqemu-$_realver.tar.gz" - -# override kernel APKBUILD's prepare -prepare() { - : -} - -build() { - cd "$srcdir"/$_realname-$_realver - ./configure --kernel-path=/lib/modules/${_abi_release}/build - make || return 1 -} - -package() { - cd "$srcdir"/$_realname-$_realver - install -D -m644 kqemu.ko \ - "$pkgdir"/lib/modules/${_abi_release}/misc/kqemu.ko \ - || return 1 -} -md5sums="d738d8ca7332211ab716ec3213d82ee1 kqemu-1.4.0pre1.tar.gz" -- cgit v1.2.3 From b434b8c6a8ee94f9d3fde77f238bab58d28c1311 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 7 Jun 2010 11:44:51 +0000 Subject: testing/asterisk-audio-konf: updated snapshot --- ...g-to-prevent-dynamic-create-of-conference.patch | 151 +++++++++++++++++++++ .../0001-create-install-dir.patch | 24 ---- testing/asterisk-audio-konf/APKBUILD | 11 +- 3 files changed, 157 insertions(+), 29 deletions(-) create mode 100644 testing/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch delete mode 100644 testing/asterisk-audio-konf/0001-create-install-dir.patch (limited to 'testing') diff --git a/testing/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch b/testing/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch new file mode 100644 index 0000000000..115c42fa28 --- /dev/null +++ b/testing/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch @@ -0,0 +1,151 @@ +From 2040c4ebe42ed6a222b87f0148c0c08701afc2fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= +Date: Mon, 7 Jun 2010 14:20:42 +0300 +Subject: [PATCH] add 'n' flag to prevent dynamic create of conference + +--- + konference/Dialplan.txt | 2 ++ + konference/conference.c | 27 ++++++++++++++++++--------- + konference/conference.h | 2 +- + konference/member.c | 12 +++++++----- + konference/member.h | 3 +++ + 5 files changed, 31 insertions(+), 15 deletions(-) + +diff --git a/konference/Dialplan.txt b/konference/Dialplan.txt +index 455703d..17287dd 100644 +--- a/konference/Dialplan.txt ++++ b/konference/Dialplan.txt +@@ -45,6 +45,8 @@ exten => ,,Konference(,,,no_create_flag ) ++ { ++ DEBUG("conference not found, and create of new conference not allowed\n") ; ++ pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "NOTFOUND"); ++ } ++ else ++ { ++ // create a new conference ++ DEBUG("attempting to create requested conference\n") ; + +- // create the new conference with one member +- conf = create_conf( member->conf_name, member ) ; ++ // create the new conference with one member ++ conf = create_conf( member->conf_name, member ) ; + +- // return an error if create_conf() failed +- if ( conf == NULL ) +- ast_log( LOG_ERROR, "unable to find or create requested conference\n" ) ; ++ // return an error if create_conf() failed ++ if ( conf == NULL ) { ++ ast_log( LOG_ERROR, "unable to find or create requested conference\n" ) ; ++ pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "NORESOURCES"); ++ } ++ } + } + else + { +@@ -656,7 +666,6 @@ struct ast_conference* join_conference( struct ast_conf_member* member, char* ma + add_member( member, conf ) ; + } else { + pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "MAXUSERS"); +- *max_users_flag = 1; + conf = NULL; + } + } +diff --git a/konference/conference.h b/konference/conference.h +index 3322f3f..e8da836 100644 +--- a/konference/conference.h ++++ b/konference/conference.h +@@ -157,7 +157,7 @@ int hash( const char *channel_name ) ; + + int count_exec( struct ast_channel* chan, void* data ) ; + +-struct ast_conference* join_conference( struct ast_conf_member* member, char* max_users_flag, const char* recfile, const char* recformat ) ; ++struct ast_conference* join_conference( struct ast_conf_member* member, const char* recfile, const char* recformat ) ; + + int end_conference( const char *name, int hangup ) ; + +diff --git a/konference/member.c b/konference/member.c +index c18fcdc..ff93b36 100644 +--- a/konference/member.c ++++ b/konference/member.c +@@ -758,14 +758,13 @@ int member_exec( struct ast_channel* chan, void* data ) + // setup a conference for the new member + // + +- char max_users_flag = 0 ; +- conf = join_conference( member, &max_users_flag, recfile, recformat ) ; ++ conf = join_conference( member, recfile, recformat ) ; + + if ( conf == NULL ) + { +- ast_log( LOG_NOTICE, "unable to setup member conference %s: max_users_flag is %d\n", member->conf_name, max_users_flag ) ; ++ ast_log( LOG_NOTICE, "unable to setup member conference %s\n", member->conf_name) ; + delete_member( member) ; +- return (max_users_flag ? 0 : -1 ) ; ++ return -1; + } + + // +@@ -1349,7 +1348,7 @@ struct ast_conf_member* create_member( struct ast_channel *chan, const char* dat + else + #endif + { +- // allowed flags are C, c, L, l, V, D, A, C, X, r, R, T, t, M, S, z, o, F, H ++ // allowed flags are C, c, L, l, V, D, A, C, X, r, R, T, t, M, S, z, o, F, H, n + // mute/no_recv options + switch ( flags[i] ) + { +@@ -1405,6 +1404,9 @@ struct ast_conf_member* create_member( struct ast_channel *chan, const char* dat + case 'M': + member->ismoderator = 1; + break; ++ case 'n': ++ member->no_create_flag = 1; ++ break; + #ifdef VIDEO + case 'N': + member->no_camera = 1; +diff --git a/konference/member.h b/konference/member.h +index 0f9005b..28eff6b 100644 +--- a/konference/member.h ++++ b/konference/member.h +@@ -105,6 +105,9 @@ struct ast_conf_member + // wait option flag + char wait_for_moderator_flag; + ++ // creation of new conference not allowed ++ char no_create_flag; ++ + // temp flag for when star is pressed + char star_pressed; + +-- +1.7.0.4 + diff --git a/testing/asterisk-audio-konf/0001-create-install-dir.patch b/testing/asterisk-audio-konf/0001-create-install-dir.patch deleted file mode 100644 index 9d2f548eb1..0000000000 --- a/testing/asterisk-audio-konf/0001-create-install-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b44f99b7ab158f3e0cf3a2344fcc58d90982378c Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Thu, 27 May 2010 09:31:03 +0000 -Subject: [PATCH] create install dir - ---- - konference/Makefile | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/konference/Makefile b/konference/Makefile -index 9cc2201..e0901df 100644 ---- a/konference/Makefile -+++ b/konference/Makefile -@@ -158,6 +158,7 @@ vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o - $(CC) $(PROFILE) -o $@ $^ -lm - - install: -+ $(INSTALL) -d $(INSTALL_MODULES_DIR) - $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR) - - --- -1.7.1 - diff --git a/testing/asterisk-audio-konf/APKBUILD b/testing/asterisk-audio-konf/APKBUILD index d10dcbc91e..cd87e2780e 100644 --- a/testing/asterisk-audio-konf/APKBUILD +++ b/testing/asterisk-audio-konf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=asterisk-audio-konf _basever=0 -_gitver=100527 +_gitver=100607 pkgver=${_basever}_git${_gitver} pkgrel=0 pkgdesc="A fork of AppKonference focused entirely on audio conferencing" @@ -14,10 +14,10 @@ install= subpackages= _snapfile="$pkgname-$pkgver.tar.bz2" source="http://build.alpinelinux.org:8010/distfiles/$_snapfile - 0001-create-install-dir.patch + 0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch " -_gitver=100527 +_gitver=100607 _giturl="git://github.com/jthomerson/AsteriskAudioKonf.git" @@ -27,6 +27,7 @@ _builddir="$srcdir"/$pkgname/konference snapshot() { _gitver=$(date +%y%m%d) pkgver=${_basever}_git$_gitver + _snapfile="$pkgname-$pkgver.tar.bz2" if [ -d "$SRCDEST"/$pkgname ]; then cd "$SRCDEST"/$pkgname @@ -62,5 +63,5 @@ package() { make INSTALL_PREFIX="$pkgdir" install } -md5sums="4e81c731d4b4bd258cd426b5d5dfcdc0 asterisk-audio-konf-0_git100527.tar.bz2 -822df062f4f0890889e3be382ae90504 0001-create-install-dir.patch" +md5sums="8a716a2d1daa622f86a485804e403571 asterisk-audio-konf-0_git100607.tar.bz2 +937afbb9fa2ce57615f09919e15ab2d3 0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch" -- cgit v1.2.3 From e12859824cf0593ceeb9acae9d30d5a99aa2d031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 8 Jun 2010 16:32:13 +0300 Subject: main/asterisk-audio-konf: moved from testing --- ...g-to-prevent-dynamic-create-of-conference.patch | 151 --------------------- testing/asterisk-audio-konf/APKBUILD | 67 --------- 2 files changed, 218 deletions(-) delete mode 100644 testing/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch delete mode 100644 testing/asterisk-audio-konf/APKBUILD (limited to 'testing') diff --git a/testing/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch b/testing/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch deleted file mode 100644 index 115c42fa28..0000000000 --- a/testing/asterisk-audio-konf/0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 2040c4ebe42ed6a222b87f0148c0c08701afc2fd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= -Date: Mon, 7 Jun 2010 14:20:42 +0300 -Subject: [PATCH] add 'n' flag to prevent dynamic create of conference - ---- - konference/Dialplan.txt | 2 ++ - konference/conference.c | 27 ++++++++++++++++++--------- - konference/conference.h | 2 +- - konference/member.c | 12 +++++++----- - konference/member.h | 3 +++ - 5 files changed, 31 insertions(+), 15 deletions(-) - -diff --git a/konference/Dialplan.txt b/konference/Dialplan.txt -index 455703d..17287dd 100644 ---- a/konference/Dialplan.txt -+++ b/konference/Dialplan.txt -@@ -45,6 +45,8 @@ exten => ,,Konference(,,,no_create_flag ) -+ { -+ DEBUG("conference not found, and create of new conference not allowed\n") ; -+ pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "NOTFOUND"); -+ } -+ else -+ { -+ // create a new conference -+ DEBUG("attempting to create requested conference\n") ; - -- // create the new conference with one member -- conf = create_conf( member->conf_name, member ) ; -+ // create the new conference with one member -+ conf = create_conf( member->conf_name, member ) ; - -- // return an error if create_conf() failed -- if ( conf == NULL ) -- ast_log( LOG_ERROR, "unable to find or create requested conference\n" ) ; -+ // return an error if create_conf() failed -+ if ( conf == NULL ) { -+ ast_log( LOG_ERROR, "unable to find or create requested conference\n" ) ; -+ pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "NORESOURCES"); -+ } -+ } - } - else - { -@@ -656,7 +666,6 @@ struct ast_conference* join_conference( struct ast_conf_member* member, char* ma - add_member( member, conf ) ; - } else { - pbx_builtin_setvar_helper(member->chan, "KONFERENCE", "MAXUSERS"); -- *max_users_flag = 1; - conf = NULL; - } - } -diff --git a/konference/conference.h b/konference/conference.h -index 3322f3f..e8da836 100644 ---- a/konference/conference.h -+++ b/konference/conference.h -@@ -157,7 +157,7 @@ int hash( const char *channel_name ) ; - - int count_exec( struct ast_channel* chan, void* data ) ; - --struct ast_conference* join_conference( struct ast_conf_member* member, char* max_users_flag, const char* recfile, const char* recformat ) ; -+struct ast_conference* join_conference( struct ast_conf_member* member, const char* recfile, const char* recformat ) ; - - int end_conference( const char *name, int hangup ) ; - -diff --git a/konference/member.c b/konference/member.c -index c18fcdc..ff93b36 100644 ---- a/konference/member.c -+++ b/konference/member.c -@@ -758,14 +758,13 @@ int member_exec( struct ast_channel* chan, void* data ) - // setup a conference for the new member - // - -- char max_users_flag = 0 ; -- conf = join_conference( member, &max_users_flag, recfile, recformat ) ; -+ conf = join_conference( member, recfile, recformat ) ; - - if ( conf == NULL ) - { -- ast_log( LOG_NOTICE, "unable to setup member conference %s: max_users_flag is %d\n", member->conf_name, max_users_flag ) ; -+ ast_log( LOG_NOTICE, "unable to setup member conference %s\n", member->conf_name) ; - delete_member( member) ; -- return (max_users_flag ? 0 : -1 ) ; -+ return -1; - } - - // -@@ -1349,7 +1348,7 @@ struct ast_conf_member* create_member( struct ast_channel *chan, const char* dat - else - #endif - { -- // allowed flags are C, c, L, l, V, D, A, C, X, r, R, T, t, M, S, z, o, F, H -+ // allowed flags are C, c, L, l, V, D, A, C, X, r, R, T, t, M, S, z, o, F, H, n - // mute/no_recv options - switch ( flags[i] ) - { -@@ -1405,6 +1404,9 @@ struct ast_conf_member* create_member( struct ast_channel *chan, const char* dat - case 'M': - member->ismoderator = 1; - break; -+ case 'n': -+ member->no_create_flag = 1; -+ break; - #ifdef VIDEO - case 'N': - member->no_camera = 1; -diff --git a/konference/member.h b/konference/member.h -index 0f9005b..28eff6b 100644 ---- a/konference/member.h -+++ b/konference/member.h -@@ -105,6 +105,9 @@ struct ast_conf_member - // wait option flag - char wait_for_moderator_flag; - -+ // creation of new conference not allowed -+ char no_create_flag; -+ - // temp flag for when star is pressed - char star_pressed; - --- -1.7.0.4 - diff --git a/testing/asterisk-audio-konf/APKBUILD b/testing/asterisk-audio-konf/APKBUILD deleted file mode 100644 index cd87e2780e..0000000000 --- a/testing/asterisk-audio-konf/APKBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# Contributor: -# Maintainer: Natanael Copa -pkgname=asterisk-audio-konf -_basever=0 -_gitver=100607 -pkgver=${_basever}_git${_gitver} -pkgrel=0 -pkgdesc="A fork of AppKonference focused entirely on audio conferencing" -url="http://github.com/jthomerson/AsteriskAudioKonf/" -license="GPL" -depends= -makedepends="asterisk-dev" -install= -subpackages= -_snapfile="$pkgname-$pkgver.tar.bz2" -source="http://build.alpinelinux.org:8010/distfiles/$_snapfile - 0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch - " - -_gitver=100607 -_giturl="git://github.com/jthomerson/AsteriskAudioKonf.git" - - -_builddir="$srcdir"/$pkgname/konference - - -snapshot() { - _gitver=$(date +%y%m%d) - pkgver=${_basever}_git$_gitver - _snapfile="$pkgname-$pkgver.tar.bz2" - - if [ -d "$SRCDEST"/$pkgname ]; then - cd "$SRCDEST"/$pkgname - git pull --rebase || return 1 - else - cd "$SRCDEST" - git clone $_giturl $pkgname - fi - cd "$SRCDEST" - tar -jcf $_snapfile $pkgname - - pkgrel=0 - sed -i -e "s/^_gitver=.*/_gitver=${_gitver}/" \ - -e "s/^pkgrel=.*/pkgrel=$pkgrel/" \ - "$startdir"/APKBUILD - checksum -} - -prepare() { - cd "$_builddir"/.. - for i in "$srcdir"/*.patch; do - patch -p1 -i "$i" || return 1 - done -} - -build() { - cd "$_builddir" - make || return 1 -} - -package() { - cd "$_builddir" - make INSTALL_PREFIX="$pkgdir" install -} - -md5sums="8a716a2d1daa622f86a485804e403571 asterisk-audio-konf-0_git100607.tar.bz2 -937afbb9fa2ce57615f09919e15ab2d3 0001-add-n-flag-to-prevent-dynamic-create-of-conference.patch" -- cgit v1.2.3 From ad5a02324292519891ef495f66889a1878a1275a Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Tue, 8 Jun 2010 14:45:04 +0000 Subject: main/bacula: moved from testing --- testing/bacula-client/APKBUILD | 70 ----------------- testing/bacula-client/bacula-client.post-install | 2 - testing/bacula-client/bacula-client.pre-install | 3 - testing/bacula-client/bacula-fd-conf | 4 - testing/bacula-client/bacula-fd-init | 22 ------ testing/bacula-client/configure.in.patch | 23 ------ testing/bacula-client/os.m4.patch | 12 --- testing/bacula/APKBUILD | 96 ------------------------ testing/bacula/bacula-dir-conf | 7 -- testing/bacula/bacula-dir-init | 23 ------ testing/bacula/bacula-fd-conf | 4 - testing/bacula/bacula-fd-init | 22 ------ testing/bacula/bacula-sd-conf | 7 -- testing/bacula/bacula-sd-init | 22 ------ testing/bacula/bacula.post-install | 10 --- testing/bacula/bacula.pre-install | 4 - testing/bacula/configure.in.patch | 23 ------ testing/bacula/os.m4.patch | 12 --- 18 files changed, 366 deletions(-) delete mode 100644 testing/bacula-client/APKBUILD delete mode 100644 testing/bacula-client/bacula-client.post-install delete mode 100644 testing/bacula-client/bacula-client.pre-install delete mode 100644 testing/bacula-client/bacula-fd-conf delete mode 100644 testing/bacula-client/bacula-fd-init delete mode 100644 testing/bacula-client/configure.in.patch delete mode 100644 testing/bacula-client/os.m4.patch delete mode 100644 testing/bacula/APKBUILD delete mode 100644 testing/bacula/bacula-dir-conf delete mode 100644 testing/bacula/bacula-dir-init delete mode 100644 testing/bacula/bacula-fd-conf delete mode 100644 testing/bacula/bacula-fd-init delete mode 100644 testing/bacula/bacula-sd-conf delete mode 100644 testing/bacula/bacula-sd-init delete mode 100644 testing/bacula/bacula.post-install delete mode 100644 testing/bacula/bacula.pre-install delete mode 100644 testing/bacula/configure.in.patch delete mode 100644 testing/bacula/os.m4.patch (limited to 'testing') diff --git a/testing/bacula-client/APKBUILD b/testing/bacula-client/APKBUILD deleted file mode 100644 index b3921077e4..0000000000 --- a/testing/bacula-client/APKBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# Contributor: Leonardo Arena -# Maintainer: Leonardo Arena -pkgname="bacula-client" -_realname="bacula" -pkgver=5.0.0 -pkgrel=3 -pkgdesc="Client (File Daemon) of Bacula, a network based backup program" -url="http://www.bacula.org" -license="GPL2" -depends="" -makedepends="openssl-dev autoconf ncurses-dev" -install="$pkgname.pre-install $pkgname.post-install" -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/project/$_realname/$_realname/$pkgver/$_realname-$pkgver.tar.gz -bacula-fd-init -bacula-fd-conf -configure.in.patch -os.m4.patch" - -prepare () { - cd "$srcdir/$_realname-$pkgver" - patch -p1 < ../../configure.in.patch - patch -p1 < ../../os.m4.patch -} - -build() { - cd "$srcdir/$_realname-$pkgver" - export LDFLAGS= - # Need to run configure at least once - # in order to do not go into an infinite loop - ./configure - make configure - make distclean - - ./configure --prefix=/usr \ - --sysconfdir=/etc/bacula \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --docdir=/usr/share/doc \ - --infodir=/usr/share/info \ - --with-pid-dir=/var/run \ - --with-subsys-dir=/var/lock/subsys \ - --enable-largefile \ - --enable-client-only \ - --enable-smartalloc \ - --disable-nls \ - --with-openssl=/usr/include/openssl \ - --with-scriptdir=/etc/bacula/scripts \ - --with-working-dir=/var/bacula \ - --with-fd-user=root \ - --with-fd-group=root \ - --with-fd-password=ca4pheexie1aeC1hee3i - make || return 1 -} - -package() { - cd "$srcdir/$_realname-$pkgver" - make DESTDIR="$pkgdir" install - - install -Dm755 $srcdir/bacula-fd-init \ - $pkgdir/etc/init.d/bacula-fd - install -Dm644 $srcdir/bacula-fd-conf \ - $pkgdir/etc/conf.d/bacula-fd -} - -md5sums="68e008d2578a6d9a50af60439db17dcb bacula-5.0.0.tar.gz -38b0fe78acdc5e65aec3a59578e98a20 bacula-fd-init -4500ce2d62bf9df33c07f70dc40f7b85 bacula-fd-conf -ebc9c2bbc9be95c920723a3f142d8e19 configure.in.patch -cf7a2a4e972697f54364654c4e282b8b os.m4.patch" diff --git a/testing/bacula-client/bacula-client.post-install b/testing/bacula-client/bacula-client.post-install deleted file mode 100644 index 51274b5c3f..0000000000 --- a/testing/bacula-client/bacula-client.post-install +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -chown bacula.bacula /var/bacula diff --git a/testing/bacula-client/bacula-client.pre-install b/testing/bacula-client/bacula-client.pre-install deleted file mode 100644 index 54f4087708..0000000000 --- a/testing/bacula-client/bacula-client.pre-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -addgroup -S bacula 2>/dev/null -exit 0 diff --git a/testing/bacula-client/bacula-fd-conf b/testing/bacula-client/bacula-fd-conf deleted file mode 100644 index 033ef74b4b..0000000000 --- a/testing/bacula-client/bacula-fd-conf +++ /dev/null @@ -1,4 +0,0 @@ -# Config file for /etc/init.d/bacula-fd - -# Options for the file daemon. -FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf" diff --git a/testing/bacula-client/bacula-fd-init b/testing/bacula-client/bacula-fd-init deleted file mode 100644 index 618b3508c7..0000000000 --- a/testing/bacula-client/bacula-fd-init +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-backup/bacula/files/3.0.3/bacula-fd-init,v 1.1 2009/11/08 17:14:46 wschlich Exp $ - -depend() { - need net - use dns -} - -start() { - ebegin "Starting bacula file daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \ - -- ${FD_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bacula file daemon" - start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid - eend $? -} diff --git a/testing/bacula-client/configure.in.patch b/testing/bacula-client/configure.in.patch deleted file mode 100644 index cfe2a0b7cf..0000000000 --- a/testing/bacula-client/configure.in.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- bacula-3.0.3-orig/autoconf/configure.in Sun Oct 18 09:10:16 2009 -+++ bacula-3.0.3/autoconf/configure.in Wed Dec 2 14:13:44 2009 -@@ -2576,6 +2576,20 @@ - fi - TAPEDRIVE="/dev/nrmt0" - ;; -+alpine) -+ dnl Make sure hostname is resolved -+ ping -c 1 $hostname 2>&1 1>/dev/null -+ if test ! $? = 0; then -+ hostname="localhost" -+ fi -+ if `test -f /etc/alpine-release && grep -q alpine /etc/alpine-release`; then -+ DISTNAME="alpine" -+ fi -+ DISTVER=`cat /etc/alpine-release` -+ TAPEDRIVE="/dev/nst0" -+ PSCMD="ps -e -o pid,comm" -+ largefile_support="yes" -+ ;; - bsdi) - DISTVER=`uname -a |awk '{print $3}'` - TAPEDRIVE="/dev/nrmt0" diff --git a/testing/bacula-client/os.m4.patch b/testing/bacula-client/os.m4.patch deleted file mode 100644 index 95dc5666ad..0000000000 --- a/testing/bacula-client/os.m4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- bacula-3.0.3-orig/autoconf/bacula-macros/os.m4 Sun Oct 18 09:10:16 2009 -+++ bacula-3.0.3/autoconf/bacula-macros/os.m4 Wed Dec 2 13:48:30 2009 -@@ -201,6 +201,9 @@ - elif test -f /etc/gentoo-release - then - DISTNAME=gentoo -+elif test -f /etc/alpine-release -+then -+ DISTNAME=alpine - elif test -f /etc/debian_version - then - DISTNAME=debian diff --git a/testing/bacula/APKBUILD b/testing/bacula/APKBUILD deleted file mode 100644 index ff4161ea1c..0000000000 --- a/testing/bacula/APKBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# Contributor: Leonardo Arena -# Maintainer: Leonardo Arena -pkgname="bacula" -pkgver=5.0.1 -pkgrel=3 -pkgdesc="Enterprise ready, network based backup program" -url="http://www.bacula.org" -license="GPL2" -depends="postgresql" -makedepends="postgresql-dev openssl-dev ncurses-dev autoconf" -install="$pkgname.pre-install $pkgname.post-install" -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz -bacula-dir-init -bacula-dir-conf -bacula-sd-init -bacula-sd-conf -bacula-fd-init -bacula-fd-conf -configure.in.patch -os.m4.patch" - -prepare () { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 < ../../configure.in.patch - patch -p1 < ../../os.m4.patch -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - export LDFLAGS= - # Need to run configure at least once - # in order to do not go into an infinite loop - ./configure - make configure - make distclean - - ./configure --prefix=/usr \ - --sysconfdir=/etc/bacula \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --docdir=/usr/share/doc \ - --infodir=/usr/share/info \ - --with-pid-dir=/var/run \ - --with-subsys-dir=/var/lock/subsys \ - --with-logdir=/var/log \ - --enable-largefile \ - --enable-smartalloc \ - --disable-nls \ - --with-openssl=/usr/include/openssl \ - --with-postgresql \ - --with-scriptdir=/etc/bacula/scripts \ - --with-working-dir=/var/bacula \ - --with-dir-user=bacula \ - --with-dir-group=bacula \ - --with-sd-user=bacula \ - --with-sd-group=bacula \ - --with-fd-user=root \ - --with-fd-group=root \ - --with-dir-password=PuemReTsKKObLe3TTaU73a3dPWwISW \ - --with-fd-password=Mbh1ujsgZ2ogRFVjPWD9TAVMFP6o8E \ - --with-sd-password=icpaksuq0gpDStLT8Uqgk1HIozFnx1 \ - --with-db-password=BQrlfPPfdXdMHlJID0HrGHZde2Lqd9 - - make || return 1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - for DAEMON in dir sd fd - do - install -Dm755 "$srcdir"/bacula-${DAEMON}-init \ - "$pkgdir"/etc/init.d/bacula-${DAEMON} - install -Dm644 "$srcdir"/bacula-${DAEMON}-conf \ - "$pkgdir"/etc/conf.d/bacula-${DAEMON} - done - install -Dm644 examples/sample-query.sql "$pkgdir"/etc/bacula/scripts/query.sql - mkdir -p "$pkgdir"/var/run/bacula - # Fix correct log dir - sed -i -e 's%/var/bacula/log%/var/log/bacula%' "$pkgdir"/etc/bacula/bacula-dir.conf - # Install logrotate script - install -Dm644 scripts/logrotate $pkgdir/etc/logrotate.d/bacula - sed -i -e 's%/var/bacula/log%/var/log/bacula%' "$pkgdir"/etc/logrotate.d/bacula -} - -md5sums="beb9f8da196b3c9ffb0356f087dbdb99 bacula-5.0.1.tar.gz -b1b328013634c98119663730e3e2da7e bacula-dir-init -20f28a16f34e3f20ed18ed81b010e765 bacula-dir-conf -5ae1fba6860a320394d65744e5640bdb bacula-sd-init -afe2f9a4d79d7d96eb9372d003d10f86 bacula-sd-conf -6ae93e570f95fa845fa534c2d2efaac0 bacula-fd-init -4500ce2d62bf9df33c07f70dc40f7b85 bacula-fd-conf -ebc9c2bbc9be95c920723a3f142d8e19 configure.in.patch -cf7a2a4e972697f54364654c4e282b8b os.m4.patch" diff --git a/testing/bacula/bacula-dir-conf b/testing/bacula/bacula-dir-conf deleted file mode 100644 index 17a56161f0..0000000000 --- a/testing/bacula/bacula-dir-conf +++ /dev/null @@ -1,7 +0,0 @@ -# Config file for /etc/init.d/bacula-dir - -# Options for the director daemon. -# The DIR can be run as a non-root user, however -# please ensure that this user has proper permissions to -# access your backup devices. -DIR_OPTIONS="-u bacula -g bacula -c /etc/bacula/bacula-dir.conf" diff --git a/testing/bacula/bacula-dir-init b/testing/bacula/bacula-dir-init deleted file mode 100644 index 033d72f9a0..0000000000 --- a/testing/bacula/bacula-dir-init +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-backup/bacula/files/3.0.3/bacula-dir-init,v 1.1 2009/11/08 17:14:46 wschlich Exp $ - -depend() { - need net postgresql - after firewall - use dns bacula-fd bacula-sd -} - -start() { - ebegin "Starting bacula director" - start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \ - -- ${DIR_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bacula director" - start-stop-daemon --stop --quiet --pidfile /var/run/bacula/bacula-dir.*.pid - eend $? -} diff --git a/testing/bacula/bacula-fd-conf b/testing/bacula/bacula-fd-conf deleted file mode 100644 index 033ef74b4b..0000000000 --- a/testing/bacula/bacula-fd-conf +++ /dev/null @@ -1,4 +0,0 @@ -# Config file for /etc/init.d/bacula-fd - -# Options for the file daemon. -FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf" diff --git a/testing/bacula/bacula-fd-init b/testing/bacula/bacula-fd-init deleted file mode 100644 index 1e36a19479..0000000000 --- a/testing/bacula/bacula-fd-init +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-backup/bacula/files/3.0.3/bacula-fd-init,v 1.1 2009/11/08 17:14:46 wschlich Exp $ - -depend() { - need net - use dns -} - -start() { - ebegin "Starting bacula file daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \ - -- ${FD_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bacula file daemon" - start-stop-daemon --stop --quiet --pidfile /var/run/bacula/bacula-fd.*.pid - eend $? -} diff --git a/testing/bacula/bacula-sd-conf b/testing/bacula/bacula-sd-conf deleted file mode 100644 index 88e13aa0eb..0000000000 --- a/testing/bacula/bacula-sd-conf +++ /dev/null @@ -1,7 +0,0 @@ -# Config file for /etc/init.d/bacula-sd - -# Options for the storage daemon. -# The SD can be run as a non-root user, however -# please ensure that this user has proper permissions to -# access your backup devices. -SD_OPTIONS="-u bacula -g bacula -c /etc/bacula/bacula-sd.conf" diff --git a/testing/bacula/bacula-sd-init b/testing/bacula/bacula-sd-init deleted file mode 100644 index 2375b8e457..0000000000 --- a/testing/bacula/bacula-sd-init +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-backup/bacula/files/3.0.3/bacula-sd-init,v 1.1 2009/11/08 17:14:46 wschlich Exp $ - -depend() { - need net - use dns -} - -start() { - ebegin "Starting bacula storage daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \ - -- ${SD_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bacula storage daemon" - start-stop-daemon --stop --quiet --pidfile /var/run/bacula/bacula-sd.*.pid - eend $? -} diff --git a/testing/bacula/bacula.post-install b/testing/bacula/bacula.post-install deleted file mode 100644 index a092957361..0000000000 --- a/testing/bacula/bacula.post-install +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -for dir in /var/bacula /var/log/bacula /var/run/bacula /var/lib/bacula /etc/bacula/scripts/make_catalog_backup* -do - chown bacula.bacula $dir -done - -for file in create_postgresql_database make_postgresql_tables grant_postgresql_privileges -do - chown postgres /etc/bacula/scripts/$file -done diff --git a/testing/bacula/bacula.pre-install b/testing/bacula/bacula.pre-install deleted file mode 100644 index bfac8567a5..0000000000 --- a/testing/bacula/bacula.pre-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -addgroup -S bacula 2>/dev/null -adduser -h /var/bacula/ -s /bin/false -G bacula -S -H -D bacula 2>/dev/null -exit 0 diff --git a/testing/bacula/configure.in.patch b/testing/bacula/configure.in.patch deleted file mode 100644 index cfe2a0b7cf..0000000000 --- a/testing/bacula/configure.in.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- bacula-3.0.3-orig/autoconf/configure.in Sun Oct 18 09:10:16 2009 -+++ bacula-3.0.3/autoconf/configure.in Wed Dec 2 14:13:44 2009 -@@ -2576,6 +2576,20 @@ - fi - TAPEDRIVE="/dev/nrmt0" - ;; -+alpine) -+ dnl Make sure hostname is resolved -+ ping -c 1 $hostname 2>&1 1>/dev/null -+ if test ! $? = 0; then -+ hostname="localhost" -+ fi -+ if `test -f /etc/alpine-release && grep -q alpine /etc/alpine-release`; then -+ DISTNAME="alpine" -+ fi -+ DISTVER=`cat /etc/alpine-release` -+ TAPEDRIVE="/dev/nst0" -+ PSCMD="ps -e -o pid,comm" -+ largefile_support="yes" -+ ;; - bsdi) - DISTVER=`uname -a |awk '{print $3}'` - TAPEDRIVE="/dev/nrmt0" diff --git a/testing/bacula/os.m4.patch b/testing/bacula/os.m4.patch deleted file mode 100644 index 95dc5666ad..0000000000 --- a/testing/bacula/os.m4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- bacula-3.0.3-orig/autoconf/bacula-macros/os.m4 Sun Oct 18 09:10:16 2009 -+++ bacula-3.0.3/autoconf/bacula-macros/os.m4 Wed Dec 2 13:48:30 2009 -@@ -201,6 +201,9 @@ - elif test -f /etc/gentoo-release - then - DISTNAME=gentoo -+elif test -f /etc/alpine-release -+then -+ DISTNAME=alpine - elif test -f /etc/debian_version - then - DISTNAME=debian -- cgit v1.2.3 From b74693872432a6ca60af8dd0fe3ce6b44664b65b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 10 Jun 2010 09:18:02 +0000 Subject: testing/privoxy: set permissions on /etc/privoxy dir --- testing/privoxy/APKBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/privoxy/APKBUILD b/testing/privoxy/APKBUILD index 3499e91725..d7417ec027 100644 --- a/testing/privoxy/APKBUILD +++ b/testing/privoxy/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=privoxy pkgver=3.0.16 -pkgrel=0 +pkgrel=1 pkgdesc="A web proxy with advanced filtering capabilities" url="http://www.privoxy.org" license="GPL" @@ -46,7 +46,8 @@ package() { "$pkgdir"/etc/logrotate.d/privoxy find "$pkgdir"/etc/privoxy/ -type d | xargs chmod 770 find "$pkgdir"/etc/privoxy/ -type f | xargs chmod 660 - chown -R privoxy:privoxy "$pkgdir"/var/log/privoxy + chown -R privoxy:privoxy "$pkgdir"/var/log/privoxy \ + "$pkgdir"/etc/privoxy } md5sums="64d3ffcdf8307e04a375773bb4eb255e privoxy-3.0.16-stable-src.tar.gz -- cgit v1.2.3 From 970062912739b23579c88a5beaf998f6adc19481 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 10 Jun 2010 09:20:41 +0000 Subject: main/privoxy: moved from testing --- testing/privoxy/APKBUILD | 56 --------------- testing/privoxy/privoxy-3.0.16-gentoo.patch | 108 ---------------------------- testing/privoxy/privoxy.initd | 32 --------- testing/privoxy/privoxy.logrotate | 9 --- testing/privoxy/privoxy.pre-install | 6 -- 5 files changed, 211 deletions(-) delete mode 100644 testing/privoxy/APKBUILD delete mode 100644 testing/privoxy/privoxy-3.0.16-gentoo.patch delete mode 100644 testing/privoxy/privoxy.initd delete mode 100644 testing/privoxy/privoxy.logrotate delete mode 100644 testing/privoxy/privoxy.pre-install (limited to 'testing') diff --git a/testing/privoxy/APKBUILD b/testing/privoxy/APKBUILD deleted file mode 100644 index d7417ec027..0000000000 --- a/testing/privoxy/APKBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=privoxy -pkgver=3.0.16 -pkgrel=1 -pkgdesc="A web proxy with advanced filtering capabilities" -url="http://www.privoxy.org" -license="GPL" -pkgusers="privoxy" -pkggroups="privoxy" -depends= -makedepends="autoconf automake pcre-dev zlib-dev coreutils" -install="privoxy.pre-install" -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/ijbswa/$pkgname-$pkgver-stable-src.tar.gz - $pkgname.initd - $pkgname.logrotate - privoxy-3.0.16-gentoo.patch - " - -_builddir="$srcdir"/$pkgname-$pkgver-stable -prepare() { - cd "$_builddir" - patch -p1 -i "$srcdir"/privoxy-3.0.16-gentoo.patch || return 1 - aclocal && autoheader && autoconf -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --localstatedir=/var/ \ - --enable-zlib \ - --enable-dynamic-pcre \ - --with-user=privoxy \ - --with-group=privoxy \ - --sysconfdir=/etc/privoxy \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install - rm $pkgdir/var/log/privoxy/* - install -D -m755 "$srcdir"/privoxy.initd "$pkgdir"/etc/init.d/privoxy - install -D -m644 "$srcdir"/privoxy.logrotate \ - "$pkgdir"/etc/logrotate.d/privoxy - find "$pkgdir"/etc/privoxy/ -type d | xargs chmod 770 - find "$pkgdir"/etc/privoxy/ -type f | xargs chmod 660 - chown -R privoxy:privoxy "$pkgdir"/var/log/privoxy \ - "$pkgdir"/etc/privoxy -} - -md5sums="64d3ffcdf8307e04a375773bb4eb255e privoxy-3.0.16-stable-src.tar.gz -170d5679e4c3504f07ef1a4c9859e9b8 privoxy.initd -f2b6a652dbfbc65e5b89024a8ea3da7e privoxy.logrotate -48cce19ecdcf8f17a021ac3aa8f837bc privoxy-3.0.16-gentoo.patch" diff --git a/testing/privoxy/privoxy-3.0.16-gentoo.patch b/testing/privoxy/privoxy-3.0.16-gentoo.patch deleted file mode 100644 index d445ec1b01..0000000000 --- a/testing/privoxy/privoxy-3.0.16-gentoo.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- privoxy/GNUmakefile.in -+++ privoxy/GNUmakefile.in -@@ -61,10 +61,10 @@ - MAN_DIR = @mandir@ - MAN_DEST = $(MAN_DIR)/man1 - SHARE_DEST = @datadir@ --DOC_DEST = $(SHARE_DEST)/doc/privoxy -+DOC_DEST = @docdir@ --VAR_DEST = @localstatedir@ -+VAR_DEST = /var - LOGS_DEST = $(VAR_DEST)/log/privoxy - PIDS_DEST = $(VAR_DEST)/run - - # if $prefix = /usr/local then the default CONFDEST change from - # CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy -@@ -901,34 +901,8 @@ - fi ;\ - $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ - for i in $(CONFIGS); do \ -- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ -- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ -- $(ECHO) Installing fresh $$i;\ - $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ -- elif [ -s "$(CONF_DEST)/$$i" ]; then \ -- $(ECHO) Installing $$i as $$i.new ;\ -- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ -- NEW=1;\ -- else \ -- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ -- fi ;\ - done ;\ -- if [ -n "$$NEW" ]; then \ -- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\ -- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\ -- fi ;\ -- [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \ -- $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\ -- $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ -- if [ x$$USER != x ]; then \ -- $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \ -- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ -- fi ;\ -- if [ x$$GROUP_T != x ]; then \ -- $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \ -- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ -- fi ;\ -- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ - if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ - if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ - $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ ---- privoxy/config -+++ privoxy/config -@@ -267,7 +267,7 @@ - # - # No trailing "/", please. - # --confdir . -+confdir /etc/privoxy - # - # - # 2.2. templdir -@@ -324,7 +324,7 @@ - # - # No trailing "/", please. - # --logdir . -+logdir /var/log/privoxy - # - # - # 2.4. actionsfile -@@ -464,7 +464,7 @@ - # Any log files must be writable by whatever user Privoxy is - # being run as (on Unix, default user id is "privoxy"). - # --logfile logfile -+logfile privoxy.log - # - # - # 2.7. trustfile ---- privoxy/default.action.master -+++ privoxy/default.action.master -@@ -564,7 +564,7 @@ - { \ - +change-x-forwarded-for{block} \ - +hide-from-header{block} \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Cautious - -@@ -584,7 +584,7 @@ - +hide-from-header{block} \ - +hide-referrer{conditional-block} \ - +session-cookies-only \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Medium - -@@ -623,7 +623,7 @@ - +hide-referrer{conditional-block} \ - +limit-connect{,} \ - +overwrite-last-modified{randomize} \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Advanced - diff --git a/testing/privoxy/privoxy.initd b/testing/privoxy/privoxy.initd deleted file mode 100644 index ef984ea3df..0000000000 --- a/testing/privoxy/privoxy.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/files/privoxy.initd,v 1.2 2007/11/14 05:14:56 mrness Exp $ - -CONFFILE=/etc/${SVCNAME}/config -PIDFILE=/var/run/${SVCNAME}.pid - -depend() { - need net -} - -start() { - if [ ! -f "${CONFFILE}" ]; then - eerror "Configuration file ${CONFFILE} not found!" - return 1 - fi - - ebegin "Starting privoxy" - start-stop-daemon --start --quiet --exec /usr/sbin/privoxy \ - --pidfile "${PIDFILE}" \ - -- \ - --pidfile "${PIDFILE}" \ - --user privoxy.privoxy "${CONFFILE}" - eend $? -} - -stop() { - ebegin "Stopping privoxy" - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend $? -} diff --git a/testing/privoxy/privoxy.logrotate b/testing/privoxy/privoxy.logrotate deleted file mode 100644 index aa7463bd57..0000000000 --- a/testing/privoxy/privoxy.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/privoxy/privoxy.log /var/log/privoxy/jarfile { - missingok - notifempty - create 0640 privoxy privoxy - sharedscripts - postrotate - killall -HUP privoxy 2>/dev/null || true - endscript -} diff --git a/testing/privoxy/privoxy.pre-install b/testing/privoxy/privoxy.pre-install deleted file mode 100644 index 38db002881..0000000000 --- a/testing/privoxy/privoxy.pre-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup privoxy 2>/dev/null -adduser -S -G privoxy -h /var/log/privoxy -s /bin/false -D privoxy 2>/dev/null -exit 0 - -- cgit v1.2.3 From 7483fd04e48431f13a0fedf3f980bb0cd7634b38 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 07:48:52 +0000 Subject: testing/mrtg: new aport MRTG Network Latency Monitoring http://oss.oetiker.ch/mrtg/ --- testing/mrtg/APKBUILD | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 testing/mrtg/APKBUILD (limited to 'testing') diff --git a/testing/mrtg/APKBUILD b/testing/mrtg/APKBUILD new file mode 100644 index 0000000000..4066c168ac --- /dev/null +++ b/testing/mrtg/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: Jeff Bilyk +# Maintainer: Natanael Copa +pkgname=mrtg +pkgver=2.16.4 +pkgrel=0 +pkgdesc="MRTG Network Latency Monitoring" +url="http://oss.oetiker.ch/mrtg/" +source="http://oss.oetiker.ch/mrtg/pub/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-doc" +depends="perl" +makedepends="gd-dev libpng-dev zlib-dev" +license="GPL" + +_builddir="$srcdir"/$pkgname-$pkgver + +build() { + cd "$_builddir" + ./configure --bindir=/usr/bin \ + --libdir=/usr/lib/mrtg2 \ + --datadir=/usr/share/doc \ + --mandir=/usr/share/doc/man \ + || return 1 + make +} + +package() { + cd "$_builddir" + make install DESTDIR="$pkgdir" +} + +md5sums="ec298200d239832ff1648fba488e1a9e mrtg-2.16.4.tar.gz" -- cgit v1.2.3 From 96869e611a33511b7501a342d11d4a4570691c36 Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Fri, 11 Jun 2010 11:58:38 +0000 Subject: testing/trac: Create tracd user/group --- testing/trac/APKBUILD | 10 ++++++---- testing/trac/trac.pre-install | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 testing/trac/trac.pre-install (limited to 'testing') diff --git a/testing/trac/APKBUILD b/testing/trac/APKBUILD index 419fb6e2df..d4e09e554e 100644 --- a/testing/trac/APKBUILD +++ b/testing/trac/APKBUILD @@ -1,15 +1,17 @@ # Contributor: Michael Mason -# Maintainer: Michael Mason +# Maintainer: Natanael Copa pkgname=trac _realname=Trac pkgver=0.11.7 -pkgrel=0 +pkgrel=1 +pkgusers="tracd" +pkggroups="tracd" pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." url="http://trac.edgewall.com/" license="GPL" depends="python py-setuptools py-genshi py-sqlite" makedepends="python-dev" -install= +install="$pkgname.pre-install" source="ftp://ftp.edgewall.com/pub/$pkgname/$_realname-$pkgver.tar.gz tracd.confd tracd.initd" @@ -23,7 +25,7 @@ build() { package() { cd "$_builddir" - + install -d -o tracd -g tracd "$pkgdir"/var/lib/trac install -m755 -D "$srcdir"/tracd.initd "$pkgdir"/etc/init.d/tracd install -m644 -D "$srcdir"/tracd.confd "$pkgdir"/etc/conf.d/tracd } diff --git a/testing/trac/trac.pre-install b/testing/trac/trac.pre-install new file mode 100644 index 0000000000..05c659552b --- /dev/null +++ b/testing/trac/trac.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +addgroup tracd 2>/dev/null +adduser -s /bin/false -G tracd -D -H tracd 2>/dev/null +exit 0 -- cgit v1.2.3 From 6be82ec40a642fc049398d571ce8394ca88d43ab Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 13:06:41 +0000 Subject: testing/mrtg: fix libdir. add init.d script --- testing/mrtg/APKBUILD | 11 ++++++---- testing/mrtg/mrtg.confd | 17 ++++++++++++++++ testing/mrtg/mrtg.initd | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 testing/mrtg/mrtg.confd create mode 100644 testing/mrtg/mrtg.initd (limited to 'testing') diff --git a/testing/mrtg/APKBUILD b/testing/mrtg/APKBUILD index 4066c168ac..9334db7a47 100644 --- a/testing/mrtg/APKBUILD +++ b/testing/mrtg/APKBUILD @@ -2,10 +2,11 @@ # Maintainer: Natanael Copa pkgname=mrtg pkgver=2.16.4 -pkgrel=0 +pkgrel=1 pkgdesc="MRTG Network Latency Monitoring" url="http://oss.oetiker.ch/mrtg/" -source="http://oss.oetiker.ch/mrtg/pub/$pkgname-$pkgver.tar.gz" +source="http://oss.oetiker.ch/mrtg/pub/$pkgname-$pkgver.tar.gz + mrtg.initd mrtg.confd" subpackages="$pkgname-doc" depends="perl" makedepends="gd-dev libpng-dev zlib-dev" @@ -16,7 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver build() { cd "$_builddir" ./configure --bindir=/usr/bin \ - --libdir=/usr/lib/mrtg2 \ + --libdir=/usr/lib \ --datadir=/usr/share/doc \ --mandir=/usr/share/doc/man \ || return 1 @@ -28,4 +29,6 @@ package() { make install DESTDIR="$pkgdir" } -md5sums="ec298200d239832ff1648fba488e1a9e mrtg-2.16.4.tar.gz" +md5sums="ec298200d239832ff1648fba488e1a9e mrtg-2.16.4.tar.gz +47053d5e51ac8eefe3807d5168219f78 mrtg.initd +a8d246d324b90fd1e37cc912d4651372 mrtg.confd" diff --git a/testing/mrtg/mrtg.confd b/testing/mrtg/mrtg.confd new file mode 100644 index 0000000000..f3be157baf --- /dev/null +++ b/testing/mrtg/mrtg.confd @@ -0,0 +1,17 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1 2005/01/26 10:35:05 ka0ttic Exp $ + +MRTG_CONF="/etc/mrtg.conf" +MRTG_PID="/var/run/mrtg.pid" + +# uncomment and set the following, if you'd like to run mrtg as a +# different user/group +#MRTG_USER="" +#MRTG_GROUP="" + +# uncomment if you'd like to enable logging +#MRTG_LOG="/var/log/mrtg.log" + +# set any extra options here +MRTG_OPTS="" diff --git a/testing/mrtg/mrtg.initd b/testing/mrtg/mrtg.initd new file mode 100644 index 0000000000..31adb2cf0a --- /dev/null +++ b/testing/mrtg/mrtg.initd @@ -0,0 +1,53 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.7 2007/04/19 19:08:08 cedk Exp $ + +depend() { + need net + + # if monitoring snmp variables on this machine: + # use net-snmpd +} + +checkconfig() { + if ! [ -f "${MRTG_CONF} ]; then + eerror "Please create ${MRTG_CONF} (try man cfgmaker)" + return 1 + fi + + mrtg --check ${MRTG_CONF} + return $? +} + +start() { + # mrtg will not run if LANG=*utf8 + # use grep instead of bash regexp for bug #159786 + echo $LANG | grep -q -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$' && LANG='C' + + checkconfig || return $? + + # enable logging? + [ -n "${MRTG_LOG}" ] && \ + MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}" + + # run as a different user? + [ -n "${MRTG_USER}" ] && \ + MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}" + + # run as a different group? + [ -n "${MRTG_GROUP}" ] && \ + MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}" + + ebegin "Starting mrtg" + start-stop-daemon --start --quiet --pidfile ${MRTG_PID} --name mrtg\ + --exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \ + ${MRTG_OPTS} ${MRTG_CONF} >/dev/null + eend $? "Failed to start mrtg" +} + +stop() { + ebegin "Stopping mrtg" + start-stop-daemon --stop --quiet --pidfile ${MRTG_PID} + eend $? "Failed to stop mrtg" +} -- cgit v1.2.3 From 3a4b60e9e1c4fd340d6847f3f3d4b1380387026a Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 13:18:22 +0000 Subject: main/trac,py-sqlite,py-setuptools,py-genshi: moved from testing --- testing/py-genshi/APKBUILD | 26 -------------------------- testing/py-setuptools/APKBUILD | 27 --------------------------- testing/py-sqlite/APKBUILD | 26 -------------------------- testing/trac/APKBUILD | 35 ----------------------------------- testing/trac/trac.pre-install | 5 ----- testing/trac/tracd.confd | 13 ------------- testing/trac/tracd.initd | 27 --------------------------- 7 files changed, 159 deletions(-) delete mode 100644 testing/py-genshi/APKBUILD delete mode 100644 testing/py-setuptools/APKBUILD delete mode 100644 testing/py-sqlite/APKBUILD delete mode 100644 testing/trac/APKBUILD delete mode 100644 testing/trac/trac.pre-install delete mode 100644 testing/trac/tracd.confd delete mode 100755 testing/trac/tracd.initd (limited to 'testing') diff --git a/testing/py-genshi/APKBUILD b/testing/py-genshi/APKBUILD deleted file mode 100644 index 461e285476..0000000000 --- a/testing/py-genshi/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: Mika Havela -# Maintainer: Mika Havela -pkgname=py-genshi -_realname=Genshi -pkgver=0.6 -pkgrel=0 -pkgdesc="Python toolkit for stream-based generation of output for the web." -url="http://genshi.edgewall.org/" -license="BSD" -depends="python" -makedepends="py-setuptools python-dev" -install= -source="http://ftp.edgewall.com/pub/genshi/$_realname-$pkgver.tar.gz" - -_builddir="$srcdir"/$_realname-$pkgver - -build() { - exit 0 -} - -build() { - cd "$_builddir" - python setup.py install --root="$pkgdir" -} - -md5sums="604e8b23b4697655d36a69c2d8ef7187 Genshi-0.6.tar.gz" diff --git a/testing/py-setuptools/APKBUILD b/testing/py-setuptools/APKBUILD deleted file mode 100644 index 2ccca3b4cd..0000000000 --- a/testing/py-setuptools/APKBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Contributor: Andrew Manison -# Maintainer: -pkgname=py-setuptools -_pkgname=${pkgname#py-} -pkgver=0.6c11 -pkgrel=0 -pkgdesc="setuptools is a collection of enhancements to the Python distutils" -url="http://pypi.python.org/pypi/setuptools" -license="PSF" -depends="python" -makedepends="python-dev" -install= -subpackages="" -source="http://pypi.python.org/packages/source/s/$_pkgname/$_pkgname-$pkgver.tar.gz" - -build() { - cd "$srcdir"/$_pkgname-$pkgver - mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages - python setup.py install --root="$pkgdir" - echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth - - # we don't provide a non-suffixed easy_install - echo "Removing non-suffixed easy_install ( $pkgdir/usr/bin/easy_install)" - rm "$pkgdir"/usr/bin/easy_install -} - -md5sums="7df2a529a074f613b509fb44feefe74e setuptools-0.6c11.tar.gz" diff --git a/testing/py-sqlite/APKBUILD b/testing/py-sqlite/APKBUILD deleted file mode 100644 index a0ae27156a..0000000000 --- a/testing/py-sqlite/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: Mika Havela -# Maintainer: Mika Havela -pkgname=py-sqlite -_realname=pysqlite -pkgver=2.6.0 -pkgrel=0 -pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" -url="http://code.google.com/p/pysqlite/" -license="MIT" -depends="python sqlite" -makedepends="sqlite-dev python-dev" -install= -source="http://pysqlite.googlecode.com/files/${_realname}-${pkgver}.tar.gz" - -_builddir="$srcdir"/$_realname-$pkgver - -build() { - return 0 -} - -package() { - cd "$_builddir" - python setup.py install --root="$pkgdir" -} - -md5sums="fc92618b3b39d02e6ff10dc467c36640 pysqlite-2.6.0.tar.gz" diff --git a/testing/trac/APKBUILD b/testing/trac/APKBUILD deleted file mode 100644 index d4e09e554e..0000000000 --- a/testing/trac/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Contributor: Michael Mason -# Maintainer: Natanael Copa -pkgname=trac -_realname=Trac -pkgver=0.11.7 -pkgrel=1 -pkgusers="tracd" -pkggroups="tracd" -pkgdesc="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system." -url="http://trac.edgewall.com/" -license="GPL" -depends="python py-setuptools py-genshi py-sqlite" -makedepends="python-dev" -install="$pkgname.pre-install" -source="ftp://ftp.edgewall.com/pub/$pkgname/$_realname-$pkgver.tar.gz - tracd.confd - tracd.initd" - -_builddir="$srcdir"/$_realname-$pkgver - -build() { - cd "$_builddir" - python setup.py install --prefix=/usr --root="$pkgdir" -} - -package() { - cd "$_builddir" - install -d -o tracd -g tracd "$pkgdir"/var/lib/trac - install -m755 -D "$srcdir"/tracd.initd "$pkgdir"/etc/init.d/tracd - install -m644 -D "$srcdir"/tracd.confd "$pkgdir"/etc/conf.d/tracd -} - -md5sums="3cd96dad0e4f25d977c422fd6e985e99 Trac-0.11.7.tar.gz -95b1311ca65e1ffcd51a191542f45ba4 tracd.confd -e53761b1e84c5d68c8e6c4b837e57008 tracd.initd" diff --git a/testing/trac/trac.pre-install b/testing/trac/trac.pre-install deleted file mode 100644 index 05c659552b..0000000000 --- a/testing/trac/trac.pre-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -addgroup tracd 2>/dev/null -adduser -s /bin/false -G tracd -D -H tracd 2>/dev/null -exit 0 diff --git a/testing/trac/tracd.confd b/testing/trac/tracd.confd deleted file mode 100644 index 2cb9d292a7..0000000000 --- a/testing/trac/tracd.confd +++ /dev/null @@ -1,13 +0,0 @@ -# The commented variables in this file are the defaults that are used -# in the init-script. You don't need to uncomment them except to -# customize them to different values. - -# Port for tracd -#TRACD_PORT="8000" - -# Options for tracd -#TRACD_OPTS="--env-parent-dir /var/lib/trac/" - -# User and group as which to run tracd -#TRACD_USER="tracd" -#TRACD_GROUP="tracd" diff --git a/testing/trac/tracd.initd b/testing/trac/tracd.initd deleted file mode 100755 index 83f84052d3..0000000000 --- a/testing/trac/tracd.initd +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/files/tracd.initd,v 1.4 2010/05/28 14:43:40 arfrever Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting tracd" - # tracd fails to create pidfile if started as non-root user, thus we are asking - # s-s-d to do that. To have correct pid we avoid -d option of tracd and use - # --background option of s-s-d. - start-stop-daemon --start --chuid ${TRACD_USER:-tracd}:${TRACD_GROUP:-tracd} \ - --pidfile /var/run/tracd.pid --make-pidfile --background \ - --env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \ - --exec /usr/bin/python -- /usr/bin/tracd \ - -p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/} - eend $? -} - -stop() { - ebegin "Stopping tracd" - start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid - eend $? -} -- cgit v1.2.3 From 593359636551590886ed807c0222dd70a3a2746f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 17:46:06 +0000 Subject: testing/gc: new aport A garbage collector for C and C++ http://www.hpl.hp.com/personal/Hans_Boehm/gc/ --- testing/gc/APKBUILD | 38 ++++++++++++++++++++++++++++++++++++++ testing/gc/uclibc-getcontext.patch | 11 +++++++++++ 2 files changed, 49 insertions(+) create mode 100644 testing/gc/APKBUILD create mode 100644 testing/gc/uclibc-getcontext.patch (limited to 'testing') diff --git a/testing/gc/APKBUILD b/testing/gc/APKBUILD new file mode 100644 index 0000000000..065fba140b --- /dev/null +++ b/testing/gc/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: Natanael Copa +pkgname=gc +pkgver=7.1 +pkgrel=0 +pkgdesc="A garbage collector for C and C++" +url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" +license="GPL" +depends= +makedepends= +subpackages="$pkgname-dev $pkgname-doc libgc++:libgccpp" +source="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-$pkgver.tar.gz + uclibc-getcontext.patch" + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i "$srcdir"/uclibc-getcontext.patch || return 1 +} + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --datadir=/usr/share/doc/gc \ + --enable-cplusplus || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install || return 1 +} + +libgccpp() { + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/ +} + +md5sums="2ff9924c7249ef7f736ecfe6f08f3f9b gc-7.1.tar.gz +bce75c75bf0cdb295ac0bf7ba0f6e267 uclibc-getcontext.patch" diff --git a/testing/gc/uclibc-getcontext.patch b/testing/gc/uclibc-getcontext.patch new file mode 100644 index 0000000000..de48fc0183 --- /dev/null +++ b/testing/gc/uclibc-getcontext.patch @@ -0,0 +1,11 @@ +--- ./mach_dep.c.orig ++++ ./mach_dep.c +@@ -175,7 +175,7 @@ + # if defined(HAVE_PUSH_REGS) + GC_push_regs(); + # elif defined(UNIX_LIKE) && !defined(DARWIN) && !defined(ARM32) && \ +- !defined(HURD) ++ !defined(HURD) && !defined(__UCLIBC__) + /* Older versions of Darwin seem to lack getcontext(). */ + /* ARM Linux often doesn't support a real getcontext(). */ + ucontext_t ctxt; -- cgit v1.2.3 From d23e64e41d17ddfb13c064a87347c28b97c413aa Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 17:48:16 +0000 Subject: testing/glibmm: new aport C++ wrapper for the GLib toolkit http://gtkmm.sourceforge.net/ --- testing/glibmm/APKBUILD | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 testing/glibmm/APKBUILD (limited to 'testing') diff --git a/testing/glibmm/APKBUILD b/testing/glibmm/APKBUILD new file mode 100644 index 0000000000..e87bffa31b --- /dev/null +++ b/testing/glibmm/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa +pkgname=glibmm +pkgver=2.24.2 +pkgrel=0 +pkgdesc="C++ wrapper for the GLib toolkit" +url="http://gtkmm.sourceforge.net/" +license="LGPL" +depends= +makedepends="glib-dev libsigc++-dev" +subpackages="$pkgname-dev $pkgname-doc" +depends_dev="libsigc++-dev" +source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +md5sums="48861fec006c2bd8e301d8e44cd12d3c glibmm-2.24.2.tar.bz2" -- cgit v1.2.3 From 76e80be280fa9200ddb661ed122e8d3d1dd6ab4f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 17:48:54 +0000 Subject: testing/cairomm: new aport C++ bindings to Cairo vector graphics library http://www.cairographics.org --- testing/cairomm/APKBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 testing/cairomm/APKBUILD (limited to 'testing') diff --git a/testing/cairomm/APKBUILD b/testing/cairomm/APKBUILD new file mode 100644 index 0000000000..ad8c64c4a6 --- /dev/null +++ b/testing/cairomm/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa +pkgname=cairomm +pkgver=1.8.4 +pkgrel=0 +pkgdesc="C++ bindings to Cairo vector graphics library" +url="http://www.cairographics.org" +license="LGPL MPL" +depends="" +makedepends="cairo-dev libsigc++-dev" +depends_dev="$makedepends" +subpackages="$pkgname-dev $pkgname-doc" +source="http://www.cairographics.org/releases/cairomm-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="559afbc47484ba3fad265e38a3dafe90 cairomm-1.8.4.tar.gz" -- cgit v1.2.3 From 60d31cadcac7f5d840df5af8b9477fdb8627cc19 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 17:49:36 +0000 Subject: testing/pangomm: new aport C++ bindings for pango http://gtkmm.sourceforge.net/ --- testing/pangomm/APKBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 testing/pangomm/APKBUILD (limited to 'testing') diff --git a/testing/pangomm/APKBUILD b/testing/pangomm/APKBUILD new file mode 100644 index 0000000000..e4ff082e49 --- /dev/null +++ b/testing/pangomm/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: Natanael Copa +pkgname=pangomm +pkgver=2.26.2 +pkgrel=0 +pkgdesc="C++ bindings for pango" +url="http://gtkmm.sourceforge.net/" +license="LGPL" +depends="" +makedepends="pango-dev glibmm-dev cairomm-dev" +depends_dev="$makedepends" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/pangomm-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="b363b09faf884db8bf8d1458d719ff00 pangomm-2.26.2.tar.bz2" -- cgit v1.2.3 From 0ad80a34dd7d4c3a0a065b1a36bb7cd41ed0512c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 17:50:13 +0000 Subject: testing/gtkmm: new aport C++ wrappers for GTK+ http://gtkmm.sourceforge.net/ --- testing/gtkmm/APKBUILD | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 testing/gtkmm/APKBUILD (limited to 'testing') diff --git a/testing/gtkmm/APKBUILD b/testing/gtkmm/APKBUILD new file mode 100644 index 0000000000..6268ca0a3d --- /dev/null +++ b/testing/gtkmm/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Natanael Copa +pkgname=gtkmm +pkgver=2.20.3 +pkgrel=0 +pkgdesc="C++ wrappers for GTK+" +url="http://gtkmm.sourceforge.net/" +license="LGPL" +depends="" +makedepends="gtk+-dev intltool glibmm-dev pangomm-dev" +depends_dev="atk-dev gtk+-dev glibmm-dev pangomm-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.20/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$srcdir"/gtkmm-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/gtkmm-$pkgver + make install DESTDIR="$pkgdir" +} +md5sums="c35f236091b4f96fe45c53b4107400a9 gtkmm-2.20.3.tar.bz2" -- cgit v1.2.3 From cded15a29b28c6b9b25c60729e4abd8f2f1c8f8d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 17:51:00 +0000 Subject: testing/lcms: new aport Lightweight color management development library/engine http://www.littlecms.com --- testing/lcms/APKBUILD | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 testing/lcms/APKBUILD (limited to 'testing') diff --git a/testing/lcms/APKBUILD b/testing/lcms/APKBUILD new file mode 100644 index 0000000000..7d3d4ca994 --- /dev/null +++ b/testing/lcms/APKBUILD @@ -0,0 +1,31 @@ +# Maintainer: Natanael Copa +pkgname=lcms +pkgver=1.19 +pkgrel=0 +pkgdesc="Lightweight color management development library/engine" +url="http://www.littlecms.com" +license="custom" +depends= +makedepends="tiff-dev jpeg-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc liblcms" +source="http://downloads.sourceforge.net/project/lcms/lcms/$pkgver/lcms-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -Dm 644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +liblcms() { + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/liblcms.so.* "$subpkgdir"/usr/lib/ +} + +md5sums="8af94611baf20d9646c7c2c285859818 lcms-1.19.tar.gz" -- cgit v1.2.3 From 7c4b31647f32bb922cbd0d55d7804b1b2355d90d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 17:52:02 +0000 Subject: testing/libsigc++: new aport type-safe Signal Framework for C++ http://libsigc.sourceforge.net/ --- testing/libsigc++/APKBUILD | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 testing/libsigc++/APKBUILD (limited to 'testing') diff --git a/testing/libsigc++/APKBUILD b/testing/libsigc++/APKBUILD new file mode 100644 index 0000000000..3d3b51c7e0 --- /dev/null +++ b/testing/libsigc++/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Natanael Copa +pkgname=libsigc++ +pkgver=2.2.8 +pkgrel=0 +pkgdesc="type-safe Signal Framework for C++" +url="http://libsigc.sourceforge.net/" +license="LGPL" +depends= +makedepends= +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar.bz2" + +build() { + cd ""$srcdir"/$pkgname-$pkgver" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +md5sums="1198425eab9fd605721a278c651b8dd8 libsigc++-2.2.8.tar.bz2" -- cgit v1.2.3 From d78981c785e44030de05a6d1d3a06cd21d651005 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 19:34:51 +0000 Subject: testing/py-xml: new aport Python XML parsing library. http://pyxml.sourceforge.net/ --- testing/py-xml/APKBUILD | 27 +++++++++++++++++++++++++++ testing/py-xml/fix-python2.6.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 testing/py-xml/APKBUILD create mode 100644 testing/py-xml/fix-python2.6.patch (limited to 'testing') diff --git a/testing/py-xml/APKBUILD b/testing/py-xml/APKBUILD new file mode 100644 index 0000000000..1dd549da07 --- /dev/null +++ b/testing/py-xml/APKBUILD @@ -0,0 +1,27 @@ +# Maintainer: Natanael Copa +pkgname=py-xml +pkgver=0.8.4 +pkgrel=0 +pkgdesc="Python XML parsing library." +url="http://pyxml.sourceforge.net/" +license="custom" +depends= +makedepends="python-dev" +source="http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-$pkgver.tar.gz + fix-python2.6.patch" + +_builddir="$srcdir"/PyXML-$pkgver +build() { + cd "$_builddir" + patch -Np1 -i "$srcdir/fix-python2.6.patch" || return 1 + python setup.py build || return 1 +} + +package() { + cd "$_builddir" + python setup.py install --prefix=/usr --root="$pkgdir" || return 1 + install -D -m644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1 +} + +md5sums="1f7655050cebbb664db976405fdba209 PyXML-0.8.4.tar.gz +4b652e0c866e3cca7e2386e8e383d5ba fix-python2.6.patch" diff --git a/testing/py-xml/fix-python2.6.patch b/testing/py-xml/fix-python2.6.patch new file mode 100644 index 0000000000..7bf1c46fc9 --- /dev/null +++ b/testing/py-xml/fix-python2.6.patch @@ -0,0 +1,28 @@ +diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 +@@ -24,8 +24,8 @@ + self._rel = rel + nt = ParsedNodeTest.ParsedNodeTest('node', '') + ppl = ParsedPredicateList.ParsedPredicateList([]) +- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') +- self._step = ParsedStep.ParsedStep(as, nt, ppl) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._step = ParsedStep.ParsedStep(asp, nt, ppl) + return + + def evaluate(self, context): +diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 +@@ -28,8 +28,8 @@ + self._right = right + nt = ParsedNodeTest.ParsedNodeTest('node','') + ppl = ParsedPredicateList.ParsedPredicateList([]) +- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') +- self._middle = ParsedStep.ParsedStep(as, nt, ppl) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) + + def evaluate(self, context): + res = [] -- cgit v1.2.3 From 173796e5e83e2958d115761a784cfb552353f9f7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 19:36:01 +0000 Subject: testing/gsl: new aport The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers http://www.gnu.org/software/gsl/gsl.html --- testing/gsl/APKBUILD | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 testing/gsl/APKBUILD (limited to 'testing') diff --git a/testing/gsl/APKBUILD b/testing/gsl/APKBUILD new file mode 100644 index 0000000000..fd4ba6ff8c --- /dev/null +++ b/testing/gsl/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa +pkgname=gsl +pkgver=1.14 +pkgrel=0 +pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" +url="http://www.gnu.org/software/gsl/gsl.html" +license="GPL" +depends= +makedepends= +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="d55e7b141815412a072a3f0e12442042 gsl-1.14.tar.gz" -- cgit v1.2.3 From 8fdf06aa29d89158455b4fb3e990754f7d90d162 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 19:36:54 +0000 Subject: testing/incskape: new aport A vector-based drawing program - svg compliant http://inkscape.sourceforge.net/ --- testing/inkscape/50-poppler-API.patch | 97 +++++++++++++++++++++++++++++++++++ testing/inkscape/APKBUILD | 53 +++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 testing/inkscape/50-poppler-API.patch create mode 100644 testing/inkscape/APKBUILD (limited to 'testing') diff --git a/testing/inkscape/50-poppler-API.patch b/testing/inkscape/50-poppler-API.patch new file mode 100644 index 0000000000..b97969de1d --- /dev/null +++ b/testing/inkscape/50-poppler-API.patch @@ -0,0 +1,97 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50-poppler-API.patch.dpatch by Kees Cook +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: https://bugs.launchpad.net/inkscape/+bug/487038 + +@DPATCH@ +diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp +--- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp 2009-10-10 12:17:47.000000000 -0700 ++++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-23 22:34:13.000000000 -0800 +@@ -809,7 +809,7 @@ + blendingColorSpace = NULL; + isolated = knockout = gFalse; + if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { +- blendingColorSpace = GfxColorSpace::parse(&obj5); ++ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); + } + obj5.free(); + if (obj4.dictLookup(const_cast("I"), &obj5)->isBool()) { +@@ -1009,9 +1009,9 @@ + state->setFillPattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); + if (obj.isNull()) { +- colorSpace = GfxColorSpace::parse(&args[0]); ++ colorSpace = GfxColorSpace::parse(&args[0], NULL); + } else { +- colorSpace = GfxColorSpace::parse(&obj); ++ colorSpace = GfxColorSpace::parse(&obj, NULL); + } + obj.free(); + if (colorSpace) { +@@ -1032,9 +1032,9 @@ + state->setStrokePattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); + if (obj.isNull()) { +- colorSpace = GfxColorSpace::parse(&args[0]); ++ colorSpace = GfxColorSpace::parse(&args[0], NULL); + } else { +- colorSpace = GfxColorSpace::parse(&obj); ++ colorSpace = GfxColorSpace::parse(&obj, NULL); + } + obj.free(); + if (colorSpace) { +@@ -1101,7 +1101,7 @@ + builder->updateStyle(state); + } + if (args[numArgs-1].isName() && +- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { ++ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { + state->setFillPattern(pattern); + builder->updateStyle(state); + } +@@ -1145,7 +1145,7 @@ + builder->updateStyle(state); + } + if (args[numArgs-1].isName() && +- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { ++ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { + state->setStrokePattern(pattern); + builder->updateStyle(state); + } +@@ -1543,7 +1543,7 @@ + double *matrix = NULL; + GBool savedState = gFalse; + +- if (!(shading = res->lookupShading(args[0].getName()))) { ++ if (!(shading = res->lookupShading(args[0].getName(), NULL))) { + return; + } + +@@ -2507,7 +2507,7 @@ + } + } + if (!obj1.isNull()) { +- colorSpace = GfxColorSpace::parse(&obj1); ++ colorSpace = GfxColorSpace::parse(&obj1, NULL); + } else if (csMode == streamCSDeviceGray) { + colorSpace = new GfxDeviceGrayColorSpace(); + } else if (csMode == streamCSDeviceRGB) { +@@ -2592,7 +2592,7 @@ + obj2.free(); + } + } +- maskColorSpace = GfxColorSpace::parse(&obj1); ++ maskColorSpace = GfxColorSpace::parse(&obj1, NULL); + obj1.free(); + if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { + goto err1; +@@ -2767,7 +2767,7 @@ + if (obj1.dictLookup(const_cast("S"), &obj2)->isName(const_cast("Transparency"))) { + transpGroup = gTrue; + if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { +- blendingColorSpace = GfxColorSpace::parse(&obj3); ++ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); + } + obj3.free(); + if (obj1.dictLookup(const_cast("I"), &obj3)->isBool()) { diff --git a/testing/inkscape/APKBUILD b/testing/inkscape/APKBUILD new file mode 100644 index 0000000000..d8c5f2452f --- /dev/null +++ b/testing/inkscape/APKBUILD @@ -0,0 +1,53 @@ +# Maintainer: Natanael Copa +pkgname=inkscape +pkgver=0.47 +pkgrel=1 +pkgdesc="A vector-based drawing program - svg compliant" +url="http://inkscape.sourceforge.net/" +license="GPL LGPL" +makedepends=" +poppler-gtk-dev +imagemagick-dev +gtkspell-dev +gc-dev +gtkmm-dev +libxslt-dev +gsl-dev +py-xml +popt-dev +lcms-dev +libxml2-dev +boost-dev +" +depends="desktop-file-utils" +install= +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + 50-poppler-API.patch" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/50-poppler-API.patch || return 1 +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} +md5sums="916c85b501bcfb0ae61fcf7318f36348 inkscape-0.47.tar.gz +b447272c9b282b49e86dca24c2581065 50-poppler-API.patch" -- cgit v1.2.3 From 253afa4a86bcb0959ca8b7fb269f482058847a9b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Jun 2010 19:44:25 +0000 Subject: testing/libsigc++: build fix --- testing/libsigc++/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/libsigc++/APKBUILD b/testing/libsigc++/APKBUILD index 3d3b51c7e0..bac91a5844 100644 --- a/testing/libsigc++/APKBUILD +++ b/testing/libsigc++/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="type-safe Signal Framework for C++" url="http://libsigc.sourceforge.net/" license="LGPL" depends= -makedepends= +makedepends="m4" subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar.bz2" -- cgit v1.2.3 From 4ff5d2d3f06d08f589f0a13512fe25e39599f874 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 12 Jun 2010 13:59:28 +0000 Subject: testing/libsigc++: build fix --- testing/libsigc++/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/libsigc++/APKBUILD b/testing/libsigc++/APKBUILD index bac91a5844..0329b63ae2 100644 --- a/testing/libsigc++/APKBUILD +++ b/testing/libsigc++/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="type-safe Signal Framework for C++" url="http://libsigc.sourceforge.net/" license="LGPL" depends= -makedepends="m4" +makedepends="m4 perl" subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar.bz2" -- cgit v1.2.3 From f9871f6bd04439077b71d0129279379677cd3043 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 12 Jun 2010 15:26:37 +0000 Subject: testing/cairomm: build fix needs perl to build docs --- testing/cairomm/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/cairomm/APKBUILD b/testing/cairomm/APKBUILD index ad8c64c4a6..9942749e0a 100644 --- a/testing/cairomm/APKBUILD +++ b/testing/cairomm/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="C++ bindings to Cairo vector graphics library" url="http://www.cairographics.org" license="LGPL MPL" depends="" -makedepends="cairo-dev libsigc++-dev" +makedepends="cairo-dev libsigc++-dev perl" depends_dev="$makedepends" subpackages="$pkgname-dev $pkgname-doc" source="http://www.cairographics.org/releases/cairomm-$pkgver.tar.gz" -- cgit v1.2.3 From 6522b8796fd9925d93d4df46aae86e3c72f7e375 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Mon, 14 Jun 2010 06:19:57 +0000 Subject: testing/coova-chilli: upgrade to 1.2.2 --- testing/coova-chilli/APKBUILD | 24 ++++++++++++++---------- testing/coova-chilli/coova-chilli-ssl.patch | 26 +++++++++++++++----------- 2 files changed, 29 insertions(+), 21 deletions(-) (limited to 'testing') diff --git a/testing/coova-chilli/APKBUILD b/testing/coova-chilli/APKBUILD index ab84e37318..047c6fbf10 100644 --- a/testing/coova-chilli/APKBUILD +++ b/testing/coova-chilli/APKBUILD @@ -4,24 +4,28 @@ # TODO: fix init.d script pkgname=coova-chilli -pkgver=1.0.14 -pkgrel=2 +pkgver=1.2.2 +pkgrel=0 pkgdesc="CoovaChilli is an open source access controller for wireless LAN" url="http://www.coova.org/" license="GPL" depends= makedepends="perl openssl-dev autoconf automake libtool" -install= #"coova-chilli.install" +install= subpackages="$pkgname-doc $pkgname-dev" source="http://ap.coova.org/chilli/coova-chilli-$pkgver.tar.gz - coova-chilli-ssl.patch - " + coova-chilli-ssl.patch" -build() { - cd "$srcdir/$pkgname-$pkgver" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd $_builddir patch -p1 -i ../coova-chilli-ssl.patch || return 1 aclocal && autoconf && automake && libtoolize || return 1 +} +build() { + cd $_builddir ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -34,9 +38,9 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $_builddir make DESTDIR="$pkgdir" install } -md5sums="88774ec55f9943d174ea7dd26e85fd8a coova-chilli-1.0.14.tar.gz -e4e94b06540c10caa750a590f3ec9ec6 coova-chilli-ssl.patch" +md5sums="44042e26c3b3c6e64a9a8769328b437d coova-chilli-1.2.2.tar.gz +4135e6e19bafdad777b8ca7388ff4101 coova-chilli-ssl.patch" diff --git a/testing/coova-chilli/coova-chilli-ssl.patch b/testing/coova-chilli/coova-chilli-ssl.patch index 618b90a60a..1567c96cb3 100644 --- a/testing/coova-chilli/coova-chilli-ssl.patch +++ b/testing/coova-chilli/coova-chilli-ssl.patch @@ -1,17 +1,21 @@ -diff -ru a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2009-10-15 09:15:00.000000000 +0000 -+++ b/src/Makefile.am 2009-10-15 09:17:20.000000000 +0000 -@@ -20,6 +20,7 @@ - chilli.h options.h util.c garden.c garden.h \ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,7 +13,8 @@ + chilli.h options.h util.c garden.c garden.h ssl.h ssl.c \ dns.c dns.h session.c session.h limits.h pkt.h pkt.c \ - chksum.c net.h net.c ms_chap.c options.c + chksum.c net.h net.c ms_chap.c options.c statusfile.c \ +-conn.h conn.c ++conn.h conn.c +libchilli_la_LIBADD = $(LIBOPENSSL) - # AM_LDFLAGS = -lchilli - -@@ -32,4 +33,4 @@ - chilli_dog_SOURCES = main-dog.c + AM_CFLAGS = -D_GNU_SOURCE -Wall -fno-builtin -fno-strict-aliasing \ + -O2 -fomit-frame-pointer -funroll-loops -pipe \ +@@ -33,7 +34,7 @@ #test_radius_SOURCES = test-radius.c + #test_dhcp_SOURCES = test-dhcp.c --LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la +-LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la ${LIBRT} +LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la $(LIBOPENSSL) + + if WITH_OPENSSL + LDADD += ${LIBSSL} -- cgit v1.2.3 From d5197ab762eebc1df37d4da29f3d86a4aa8aeb52 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 15 Jun 2010 19:28:47 +0000 Subject: testing/btrfs-progs: new aport Tools for the btrfs https://btrfs.wiki.kernel.org/ --- testing/btrfs-progs/APKBUILD | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 testing/btrfs-progs/APKBUILD (limited to 'testing') diff --git a/testing/btrfs-progs/APKBUILD b/testing/btrfs-progs/APKBUILD new file mode 100644 index 0000000000..675e8c0c47 --- /dev/null +++ b/testing/btrfs-progs/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: +# Maintainer: +pkgname=btrfs-progs +pkgver=0.19 +pkgrel=0 +pkgdesc="Tools for the btrfs" +url="https://btrfs.wiki.kernel.org/" +license="GPL" +depends= +makedepends="util-linux-ng-dev" +install= +subpackages="$pkgname-doc" +source="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + make prefix=/usr || return 1 +} + +package() { + cd "$_builddir" + make prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install + + # remove the 2 lines below (and this) if there is no init.d script + # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +md5sums="5854728d080cc76f21a83bdc99b6ddaa btrfs-progs-0.19.tar.bz2" -- cgit v1.2.3 From bafaada30f78b3e5904391f90a87380026de3db8 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 15 Jun 2010 19:46:45 +0000 Subject: testing/btrfs-progs: build fix needs bash --- testing/btrfs-progs/APKBUILD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/btrfs-progs/APKBUILD b/testing/btrfs-progs/APKBUILD index 675e8c0c47..62b90460c1 100644 --- a/testing/btrfs-progs/APKBUILD +++ b/testing/btrfs-progs/APKBUILD @@ -1,5 +1,4 @@ -# Contributor: -# Maintainer: +# Maintainer: Natanael Copa pkgname=btrfs-progs pkgver=0.19 pkgrel=0 @@ -7,7 +6,7 @@ pkgdesc="Tools for the btrfs" url="https://btrfs.wiki.kernel.org/" license="GPL" depends= -makedepends="util-linux-ng-dev" +makedepends="util-linux-ng-dev bash" install= subpackages="$pkgname-doc" source="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-$pkgver.tar.bz2" -- cgit v1.2.3 From 4b20d0b02e195030bdf08e763ac282006fb777ab Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 16 Jun 2010 10:02:06 +0000 Subject: testing/kamailio: fix location for kamailio.cfg fixes #248 --- testing/kamailio/APKBUILD | 16 +++++++++------- testing/kamailio/kamailio.cfg | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'testing') diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index aee29ffc05..2f8007ee22 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=kamailio pkgver=3.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" @@ -51,8 +51,8 @@ prepare() { build() { cd "$_builddir" - make prefix=/usr \ - cfg-dir=/etc/kamailio/ \ + make LOCALBASE=/usr \ + cfg_target=/etc/kamailio/ \ MODS_MYSQL=yes \ MODS_PCRE=yes \ MODS_PRESENCE=yes \ @@ -64,15 +64,17 @@ build() { package() { cd "$_builddir" - make prefix=/usr \ - cfg-dir=/etc/kamailio/ \ + make LOCALBASE=/usr \ + cfg_target=/etc/kamailio/ \ MODS_MYSQL=yes \ MODS_PCRE=yes \ MODS_PRESENCE=yes \ MODS_RADIUS= \ TLS= \ include_modules="$_modules" \ - basedir="$pkgdir" install || return 1 + basedir="$pkgdir" \ + cfg_prefix="$pkgdir" \ + install || return 1 # move default config to -doc package and use our own default config @@ -145,7 +147,7 @@ unixodbc() { } md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz -eb665248ee39cf755a247286affc5cbb kamailio.cfg +865979ca14a727e99e0de5ca2426603f kamailio.cfg 81100c479890a2a8c2628db22fdd1a0c kamailio.initd c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install 3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install diff --git a/testing/kamailio/kamailio.cfg b/testing/kamailio/kamailio.cfg index 9c101a871f..5a45cfdbbf 100644 --- a/testing/kamailio/kamailio.cfg +++ b/testing/kamailio/kamailio.cfg @@ -14,7 +14,7 @@ children = 4 dns = no rev_dns = no -mpath = "/usr/lib/kamailio/modules/" +mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" #-------------------------------------------------------- # Section 2: Modules #-------------------------------------------------------- -- cgit v1.2.3 From b0825c6fc161b4791934185ee28a681462adb6f7 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Wed, 16 Jun 2010 11:12:27 +0000 Subject: testing/open-iscsi: conf.d file added --- testing/open-iscsi/APKBUILD | 9 ++++++--- testing/open-iscsi/iscsid.confd | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 testing/open-iscsi/iscsid.confd (limited to 'testing') diff --git a/testing/open-iscsi/APKBUILD b/testing/open-iscsi/APKBUILD index 0f4076e21d..37d5f37409 100644 --- a/testing/open-iscsi/APKBUILD +++ b/testing/open-iscsi/APKBUILD @@ -2,7 +2,7 @@ pkgname=open-iscsi pkgver=2.0.871 _realver=2.0-871 -pkgrel=2 +pkgrel=3 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator" url="http://www.open-iscsi.org" license="GPL-2" @@ -13,7 +13,8 @@ subpackages="$pkgname-doc" source="http://www.open-iscsi.org/bits/$pkgname-$_realver.tar.gz CVE-2009-1297.patch open-iscsi-2.0.871-makefile-cleanup.patch - iscsid.initd" + iscsid.initd + iscsid.confd" _builddir="$srcdir"/$pkgname-$_realver @@ -38,9 +39,11 @@ package() { mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin install -Dm755 ../../iscsid.initd "$pkgdir"/etc/init.d/iscsid + install -Dm644 ../../iscsid.confd "$pkgdir"/etc/conf.d/iscsid } md5sums="0c403e8c9ad41607571ba0e6e8ff196e open-iscsi-2.0-871.tar.gz d1584790b4e12f087e60089880b53d2b CVE-2009-1297.patch 734300d7b7590dc9ae9b2fb7f5b51bf0 open-iscsi-2.0.871-makefile-cleanup.patch -3e89cb86395756dafebc4f1490f0de10 iscsid.initd" +3e89cb86395756dafebc4f1490f0de10 iscsid.initd +b762b687d4628791b4362df22cf22d34 iscsid.confd" diff --git a/testing/open-iscsi/iscsid.confd b/testing/open-iscsi/iscsid.confd new file mode 100644 index 0000000000..1c4cc40542 --- /dev/null +++ b/testing/open-iscsi/iscsid.confd @@ -0,0 +1,13 @@ +# /etc/conf.d/iscsid + +# config file to use +CONFIG_FILE=/etc/iscsi/iscsid.conf + +# you need to specify an initiatorname in the file +INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi + +# options to pass to iscsid +OPTS="-i ${INITIATORNAME_FILE}" + +# Start automatic targets when iscsid is started +AUTOSTARTTARGETS="yes" -- cgit v1.2.3 From fd6f66ca788471a9446350261d7bd1b48af94388 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Wed, 16 Jun 2010 12:19:44 +0000 Subject: main/open-iscsi*: moved to main --- testing/open-iscsi-grsec/APKBUILD | 59 ---------- testing/open-iscsi-grsec/CVE-2009-1297.patch | 31 ------ testing/open-iscsi-grsec/Makefile.kernel.patch | 11 -- .../open-iscsi-2.0.871-makefile-cleanup.patch | 33 ------ testing/open-iscsi/APKBUILD | 49 -------- testing/open-iscsi/CVE-2009-1297.patch | 31 ------ testing/open-iscsi/iscsid.confd | 13 --- testing/open-iscsi/iscsid.initd | 124 --------------------- .../open-iscsi-2.0.871-makefile-cleanup.patch | 33 ------ 9 files changed, 384 deletions(-) delete mode 100644 testing/open-iscsi-grsec/APKBUILD delete mode 100644 testing/open-iscsi-grsec/CVE-2009-1297.patch delete mode 100644 testing/open-iscsi-grsec/Makefile.kernel.patch delete mode 100644 testing/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch delete mode 100644 testing/open-iscsi/APKBUILD delete mode 100644 testing/open-iscsi/CVE-2009-1297.patch delete mode 100644 testing/open-iscsi/iscsid.confd delete mode 100644 testing/open-iscsi/iscsid.initd delete mode 100644 testing/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch (limited to 'testing') diff --git a/testing/open-iscsi-grsec/APKBUILD b/testing/open-iscsi-grsec/APKBUILD deleted file mode 100644 index 1bda4a7f2e..0000000000 --- a/testing/open-iscsi-grsec/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Leonardo Arena - -_flavor=grsec -_realname=open-iscsi -_realver=2.0-871 -# source the kernel version -if [ -f ../../main/linux-$_flavor/APKBUILD ]; then - . ../../main/linux-$_flavor/APKBUILD -fi -_kver=$pkgver -_kernelver=$pkgver-r$pkgrel -_abi_release=$pkgver-${_flavor} -_kpkgrel=$pkgrel -_ksrc=/usr/src/linux-headers-${_abi_release} - -_iscsiver=2.0-871 - -pkgname=${_realname}-${_flavor} -pkgver=$_kver -_mypkgrel=0 -pkgrel=$(($_kpkgrel + $_mypkgrel)) -pkgdesc="$_flavor kernel modules for open-iscsi $_iscsiver" -url="http://www.open-iscsi.org" -license="GPL-2" -depends="linux-${_flavor}=${_kernelver}" -install= -makedepends="linux-${_flavor}-dev=${_kernelver}" -subpackages= -source="http://www.open-iscsi.org/bits/$_realname-$_realver.tar.gz - Makefile.kernel.patch - CVE-2009-1297.patch - open-iscsi-2.0.871-makefile-cleanup.patch" - -_builddir="$srcdir/$_realname-$_realver" - -prepare() { - cd "$_builddir" - patch -p0 < ../../CVE-2009-1297.patch || return 1 - patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1 - patch -p2 < ../../Makefile.kernel.patch || return 1 -} - -build() { - cd "$_builddir" - unset ARCH - make KSRC="$_ksrc" kernel || return 1 -} - -package() { - cd "$_builddir" - make KSRC="$_ksrc" DESTDIR="$pkgdir" \ - INSTALL_MOD_DIR="extra/drivers/scsi" \ - install_kernel -} - -md5sums="0c403e8c9ad41607571ba0e6e8ff196e open-iscsi-2.0-871.tar.gz -c5289f800ceebf59319fea284d476cdf Makefile.kernel.patch -d1584790b4e12f087e60089880b53d2b CVE-2009-1297.patch -734300d7b7590dc9ae9b2fb7f5b51bf0 open-iscsi-2.0.871-makefile-cleanup.patch" diff --git a/testing/open-iscsi-grsec/CVE-2009-1297.patch b/testing/open-iscsi-grsec/CVE-2009-1297.patch deleted file mode 100644 index d1728fff7e..0000000000 --- a/testing/open-iscsi-grsec/CVE-2009-1297.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100 -+++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100 -@@ -104,24 +104,22 @@ - - connected=0 - discovered=0 -- df=/tmp/discovered.$$ - - dbg "starting discovery to $ip" -- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df} -- while read portal target -+ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})" -+ echo "${disc}" | while read portal target - do - portal=${portal%,*} - select_transport -- done < ${df} -+ done - -- discovered=$(cat ${df} | wc -l) -+ discovered=$(echo "${disc}" | wc -l) - if [ ${discovered} = 0 ]; then - echo "failed to discover targets at ${ip}" - exit 2 - else - echo "discovered ${discovered} targets at ${ip}" - fi -- /bin/rm -f ${df} - } - - try_login() diff --git a/testing/open-iscsi-grsec/Makefile.kernel.patch b/testing/open-iscsi-grsec/Makefile.kernel.patch deleted file mode 100644 index 552e31b47f..0000000000 --- a/testing/open-iscsi-grsec/Makefile.kernel.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/open-iscsi-2.0-871/kernel/Makefile -+++ Makefile -@@ -102,6 +102,8 @@ - - linux_2_6_30: $(unpatch_code) - -+linux_2_6_32: $(unpatch_code) -+ - - do_unpatch_code: - echo "Un-patching source code for use with linux-2.6.14 and up ..." diff --git a/testing/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch b/testing/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch deleted file mode 100644 index 6ca2a4eaba..0000000000 --- a/testing/open-iscsi-grsec/open-iscsi-2.0.871-makefile-cleanup.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nuar open-iscsi-2.0-871.orig/usr/Makefile open-iscsi-2.0-871/usr/Makefile ---- open-iscsi-2.0-871.orig/usr/Makefile 2009-07-10 20:55:58.000000000 -0700 -+++ open-iscsi-2.0-871/usr/Makefile 2009-11-12 00:58:16.467960344 -0800 -@@ -48,14 +48,14 @@ - all: $(PROGRAMS) - - iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o -- $(CC) $(CFLAGS) $^ -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o -- $(CC) $(CFLAGS) $^ -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) -static $^ -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - -diff -Nuar open-iscsi-2.0-871.orig/utils/Makefile open-iscsi-2.0-871/utils/Makefile ---- open-iscsi-2.0-871.orig/utils/Makefile 2009-07-10 20:55:58.000000000 -0700 -+++ open-iscsi-2.0-871/utils/Makefile 2009-11-12 00:58:56.404623435 -0800 -@@ -6,7 +6,7 @@ - all: $(PROGRAMS) - - iscsi-iname: md5.o iscsi-iname.o -- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(DBM_LIB) $^ - - clean: - rm -f *.o $(PROGRAMS) .depend diff --git a/testing/open-iscsi/APKBUILD b/testing/open-iscsi/APKBUILD deleted file mode 100644 index 37d5f37409..0000000000 --- a/testing/open-iscsi/APKBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: Leonardo Arena -pkgname=open-iscsi -pkgver=2.0.871 -_realver=2.0-871 -pkgrel=3 -pkgdesc="High performance, transport independent, multi-platform iSCSI initiator" -url="http://www.open-iscsi.org" -license="GPL-2" -depends= -makedepends= -install="" -subpackages="$pkgname-doc" -source="http://www.open-iscsi.org/bits/$pkgname-$_realver.tar.gz - CVE-2009-1297.patch - open-iscsi-2.0.871-makefile-cleanup.patch - iscsid.initd - iscsid.confd" - -_builddir="$srcdir"/$pkgname-$_realver - -prepare() { - cd "$_builddir" - patch -p0 < ../../CVE-2009-1297.patch || return 1 - patch -p1 < ../../open-iscsi-2.0.871-makefile-cleanup.patch || return 1 -} - -build() { - cd "$_builddir" - make user || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install_user - mkdir -p $pkgdir/usr/bin - mkdir -p $pkgdir/usr/sbin - mv $pkgdir/sbin/iscsi-iname $pkgdir/usr/bin - mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin - mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin - mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin - install -Dm755 ../../iscsid.initd "$pkgdir"/etc/init.d/iscsid - install -Dm644 ../../iscsid.confd "$pkgdir"/etc/conf.d/iscsid -} - -md5sums="0c403e8c9ad41607571ba0e6e8ff196e open-iscsi-2.0-871.tar.gz -d1584790b4e12f087e60089880b53d2b CVE-2009-1297.patch -734300d7b7590dc9ae9b2fb7f5b51bf0 open-iscsi-2.0.871-makefile-cleanup.patch -3e89cb86395756dafebc4f1490f0de10 iscsid.initd -b762b687d4628791b4362df22cf22d34 iscsid.confd" diff --git a/testing/open-iscsi/CVE-2009-1297.patch b/testing/open-iscsi/CVE-2009-1297.patch deleted file mode 100644 index d1728fff7e..0000000000 --- a/testing/open-iscsi/CVE-2009-1297.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100 -+++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100 -@@ -104,24 +104,22 @@ - - connected=0 - discovered=0 -- df=/tmp/discovered.$$ - - dbg "starting discovery to $ip" -- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df} -- while read portal target -+ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})" -+ echo "${disc}" | while read portal target - do - portal=${portal%,*} - select_transport -- done < ${df} -+ done - -- discovered=$(cat ${df} | wc -l) -+ discovered=$(echo "${disc}" | wc -l) - if [ ${discovered} = 0 ]; then - echo "failed to discover targets at ${ip}" - exit 2 - else - echo "discovered ${discovered} targets at ${ip}" - fi -- /bin/rm -f ${df} - } - - try_login() diff --git a/testing/open-iscsi/iscsid.confd b/testing/open-iscsi/iscsid.confd deleted file mode 100644 index 1c4cc40542..0000000000 --- a/testing/open-iscsi/iscsid.confd +++ /dev/null @@ -1,13 +0,0 @@ -# /etc/conf.d/iscsid - -# config file to use -CONFIG_FILE=/etc/iscsi/iscsid.conf - -# you need to specify an initiatorname in the file -INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi - -# options to pass to iscsid -OPTS="-i ${INITIATORNAME_FILE}" - -# Start automatic targets when iscsid is started -AUTOSTARTTARGETS="yes" diff --git a/testing/open-iscsi/iscsid.initd b/testing/open-iscsi/iscsid.initd deleted file mode 100644 index 572b0a6ae5..0000000000 --- a/testing/open-iscsi/iscsid.initd +++ /dev/null @@ -1,124 +0,0 @@ -#!/sbin/runscript - -opts="${opts} starttargets stoptargets restarttargets" - -depend() { - after modules - use net -} - -checkconfig() { - if [ ! -e /etc/conf.d/${SVCNAME} ]; then - eerror "Config file /etc/conf.d/${SVCNAME} does not exist!" - return 1 - fi - if [ ! -e "${CONFIG_FILE}" ]; then - eerror "Config file ${CONFIG_FILE} does not exist!" - return 1 - fi - if [ ! -e ${INITIATORNAME_FILE} ] || [ ! "$(grep "^InitiatorName=iqn\." ${INITIATORNAME_FILE})" ]; then - ewarn "${INITIATORNAME_FILE} should contain a string with your initiatior name." - IQN=iqn.$(date +%Y-%m).$(hostname -f | awk 'BEGIN { FS=".";}{x=NF; while (x>0) {printf $x ;x--; if (x>0) printf ".";} print ""}'):openiscsi - IQN=${IQN}-$(echo ${RANDOM}${RANDOM}${RANDOM}${RANDOM}${RANDOM} | md5sum | sed -e "s/\(.*\) -/\1/g" -e 's/ //g') - ebegin "Creating InitiatorName ${IQN} in ${INITIATORNAME_FILE}" - echo "InitiatorName=${IQN}" >> "${INITIATORNAME_FILE}" - eend $? - fi -} - -do_modules() { - msg="$1" - shift - modules="${1}" - shift - modopts="$@" - for m in ${modules} - do - if [ -n "$(find /lib/modules/`uname -r` | grep ${m})" ] - then - ebegin "${msg} ${m}" - modprobe ${modopts} ${m} - ret=$? - eend ${ret} - if [ ${ret} -ne 0 ]; then - return ${ret} - fi - else - ebegin "${msg} ${m}: not found" - return 1 - fi - done - return 0 -} - -start() { - ebegin "Checking open-iSCSI configuration" - checkconfig - ret=$? - if [ $ret -ne 0 ]; then - eend 1 - return 1 - fi - ebegin "Loading iSCSI modules" - do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp' - ret=$? - if [ $ret -ne 0 ]; then - eend 1 - return 1 - fi - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --exec /usr/sbin/iscsid -- ${OPTS} - ret=$? - if [ $ret -ne 0 ]; then - eend $? - return $? - fi - - # Start automatic targets when iscsid is started - if [ "${AUTOSTARTTARGETS}" = "yes" ]; then - starttargets - return $? - fi - return 0 -} - -stop() { - stoptargets - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --signal HUP --stop --quiet --exec /usr/sbin/iscsid #--pidfile $PID_FILE - eend $? - - # ugly, but pid file is not removed by iscsid - rm -f $PID_FILE - - do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r' - eend $? -} - -starttargets() { - ebegin "Setting up iSCSI targets" - /usr/bin/iscsiadm -m node --loginall=automatic - ret=$? - eend $ret - return $ret -} - -stoptargets() { - ebegin "Disconnecting iSCSI targets" - sync - /usr/bin/iscsiadm -m node --logoutall=all - ret=$? - eend $ret - return $ret -} - -restarttargets() { - stoptargets - starttargets -} - -status() { - ebegin "Showing current active iSCSI sessions" - /usr/bin/iscsiadm -m session -} diff --git a/testing/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch b/testing/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch deleted file mode 100644 index 6ca2a4eaba..0000000000 --- a/testing/open-iscsi/open-iscsi-2.0.871-makefile-cleanup.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nuar open-iscsi-2.0-871.orig/usr/Makefile open-iscsi-2.0-871/usr/Makefile ---- open-iscsi-2.0-871.orig/usr/Makefile 2009-07-10 20:55:58.000000000 -0700 -+++ open-iscsi-2.0-871/usr/Makefile 2009-11-12 00:58:16.467960344 -0800 -@@ -48,14 +48,14 @@ - all: $(PROGRAMS) - - iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o -- $(CC) $(CFLAGS) $^ -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - iscsiadm: $(COMMON_SRCS) $(FW_BOOT_SRCS) strings.o discovery.o iscsiadm.o -- $(CC) $(CFLAGS) $^ -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) -static $^ -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - -diff -Nuar open-iscsi-2.0-871.orig/utils/Makefile open-iscsi-2.0-871/utils/Makefile ---- open-iscsi-2.0-871.orig/utils/Makefile 2009-07-10 20:55:58.000000000 -0700 -+++ open-iscsi-2.0-871/utils/Makefile 2009-11-12 00:58:56.404623435 -0800 -@@ -6,7 +6,7 @@ - all: $(PROGRAMS) - - iscsi-iname: md5.o iscsi-iname.o -- $(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(DBM_LIB) $^ - - clean: - rm -f *.o $(PROGRAMS) .depend -- cgit v1.2.3 From a1d0bf089a27b42a43001fcf2382ed98a471ecef Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 17 Jun 2010 13:05:31 +0000 Subject: testing/cherokee: rebuild against new ffmpeg --- testing/cherokee/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/cherokee/APKBUILD b/testing/cherokee/APKBUILD index 7705d87ce4..f93cfcf588 100644 --- a/testing/cherokee/APKBUILD +++ b/testing/cherokee/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mika Havela pkgname=cherokee pkgver=0.99.41 -pkgrel=2 +pkgrel=3 pkgdesc="A very fast, flexible and easy to configure Web Server" url="http://www.cherokee-project.com/" license="GPL2" -- cgit v1.2.3 From bb45e1bb2278c4b00d8f7438327c8fdc777d8666 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 18 Jun 2010 14:28:10 +0000 Subject: testing/awstats: new aport AWStats is short for Advanced Web Statistics. http://awstats.sourceforge.net/ ref #363 --- testing/awstats/APKBUILD | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 testing/awstats/APKBUILD (limited to 'testing') diff --git a/testing/awstats/APKBUILD b/testing/awstats/APKBUILD new file mode 100644 index 0000000000..4dddfdd1fe --- /dev/null +++ b/testing/awstats/APKBUILD @@ -0,0 +1,58 @@ +# Maintainer: Natanael Copa +pkgname=awstats +pkgver=6.95 +pkgrel=0 +pkgdesc="AWStats is short for Advanced Web Statistics." +url="http://awstats.sourceforge.net/" +license="GPL-2" +depends="perl perl-uri" +subpackages="$pkgname-doc" +source="http://awstats.sourceforge.net/files/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local file + cd "$_builddir" + for file in tools/* wwwroot/cgi-bin/*; do + [ -f "${file}" ] || continue + sed -e "s:/usr/local/awstats/wwwroot:/usr/lib/awstats:g" \ + -i "$file" + done +} + +build() { + return 0 +} + +package() { + cd "$_builddir" +# logpath="awstats_log" +# sed -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \ +# -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" +# -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" +# -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin\"|" +# -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" +# if use ipv6; then +# sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" +# fi + + install -d "$pkgdir"/usr/share/doc/awstats \ + "$pkgdir"/var/lib/awstats \ + "$pkgdir"/usr/lib/awstats \ + "$pkgdir"/usr/bin \ + "$pkgdir"/etc/awstats + # docs + cp -a docs tools/xslt "$pkgdir"/usr/share/doc/awstats || return 1 + + # cgi-bin + cp -a wwwroot/* "$pkgdir"/usr/lib/awstats + mv "$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf \ + "$pkgdir"/etc/awstats/ + ln -s /etc/aswtats/awstats \ + "$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf + + # tools + cp tools/*.pl "$pkgdir"/usr/bin/ || return 1 + ln -s /usr/lib/awstats/cgi-bin/awstats.pl "$pkgdir"/usr/bin/ +} +md5sums="26a5b19fa9f395e9e7dafed37b795d7f awstats-6.95.tar.gz" -- cgit v1.2.3 From 6bbdb5c3c5036522d18e85662255ee0194a6e08c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 18 Jun 2010 20:08:39 +0000 Subject: testing/lua-lgob: new aport Set of Lua bindings that uses gobject-instrospection http://oproj.tuxfamily.org --- testing/lua-lgob/APKBUILD | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 testing/lua-lgob/APKBUILD (limited to 'testing') diff --git a/testing/lua-lgob/APKBUILD b/testing/lua-lgob/APKBUILD new file mode 100644 index 0000000000..17a38eaa3e --- /dev/null +++ b/testing/lua-lgob/APKBUILD @@ -0,0 +1,34 @@ +# Maintainer: Natanael Copa +pkgname=lua-lgob +pkgver=10.05 +pkgrel=0 +pkgdesc="Set of Lua bindings that uses gobject-instrospection" +url="http://oproj.tuxfamily.org" +license="LGPL" +depends="lua" +makedepends="lua-dev cairo-dev gtk+-dev pango-dev vte-dev gtkspell-dev + webkit-dev atk-dev gstreamer-dev gst-plugins-base-dev poppler-gtk-dev + gtksourceview-dev" +subpackages="$pkgname-dev" +source="http://downloads.tuxfamily.org/oproj/lgob/lgob-$pkgver.tar.bz2" + +# 'codegen', 'common', 'gobject', 'loader', 'cairo', 'gdk', 'gtk', +# 'pango', 'pangocairo', 'vte', 'webkit', 'atk', 'gstreamer', 'gtkspell', +# 'gtksourceview', 'goocanvas', 'poppler', 'clutter', 'cluttergtk' +_mods="codegen common gobject loader cairo gdk gtk pango pangocairo vte webkit + atk gstreamer gtkspell gtksourceview poppler" +build() { + cd "$srcdir"/lgob-$pkgver +} + +package() { + cd "$srcdir"/lgob-$pkgver + for i in $_mods; do + cd $i + make DESTDIR="$pkgdir"/usr \ + && make DESTDIR="$pkgdir"/usr install|| return 1 + cd .. + done +} + +md5sums="ac3eb632d53c8c3d181b317482bacff7 lgob-10.05.tar.bz2" -- cgit v1.2.3 From e36c61c0f09d9c36a33edfd2fae36f0e7c480336 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Tue, 22 Jun 2010 11:05:06 +0000 Subject: testing/libusb-compat: new aport --- testing/libusb-compat/APKBUILD | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 testing/libusb-compat/APKBUILD (limited to 'testing') diff --git a/testing/libusb-compat/APKBUILD b/testing/libusb-compat/APKBUILD new file mode 100644 index 0000000000..48143085dd --- /dev/null +++ b/testing/libusb-compat/APKBUILD @@ -0,0 +1,39 @@ +# Maintainer: Leonardo Arena +pkgname=libusb-compat +pkgver=0.1.3 +pkgrel=0 +pkgdesc="Compatibility library for use by user level applications to access USB devices regardless of OS" +url="http://www.libusb.org/" +license="LGPL v2.1" +depends= +makedepends= +install= +subpackages="$pkgname-dev" +source="http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + # remove the 2 lines below (and this) if there is no init.d script + # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +md5sums="570ac2ea085b80d1f74ddc7c6a93c0eb libusb-compat-0.1.3.tar.bz2" -- cgit v1.2.3 From bb87c077f9ae1e89c0cca15cdcd25952cb2dfadd Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Tue, 22 Jun 2010 11:05:50 +0000 Subject: testing/usb-modeswitch: new aport --- testing/usb-modeswitch/APKBUILD | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 testing/usb-modeswitch/APKBUILD (limited to 'testing') diff --git a/testing/usb-modeswitch/APKBUILD b/testing/usb-modeswitch/APKBUILD new file mode 100644 index 0000000000..55f87034ba --- /dev/null +++ b/testing/usb-modeswitch/APKBUILD @@ -0,0 +1,53 @@ +# Maintainer: Leonardo Arena +pkgname=usb-modeswitch +pkgver=1.1.2 +pkgrel=0 +_pkgdata=20100418 +pkgdesc="A mode switching tool for controlling flip flop (multiple device) USB gear" +url="http://www.draisberghof.de/usb_modeswitch/" +license="GPL" +depends="tcl" +makedepends="libusb-compat-dev" +install= +subpackages="$pkgname-doc" +source="http://www.draisberghof.de/usb_modeswitch/${pkgname}-${pkgver}.tar.bz2 + http://www.draisberghof.de/usb_modeswitch/${pkgname}-data-${_pkgdata}.tar.bz2 + http://www.draisberghof.de/usb_modeswitch/usb_modeswitch.setup" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + mkdir -p $pkgdir/lib/udev/usb_modeswitch || return 1 + mkdir -p $pkgdir/etc || return 1 + mkdir -p $pkgdir/usr/share/man/man1 || return 1 + make clean || return 1 + sed -i -e 's/--mode=/-m/' Makefile + cd ../${pkgname}-data-${_pkgdata} + sed -i -e 's%install --mode=644 -t $(ETCDIR)/usb_modeswitch.d \./usb_modeswitch.d/\*%cp -R ./usb_modeswitch.d/\* $(ETCDIR)/usb_modeswitch.d%' Makefile + sed -i -e 's/--mode=/-m/' Makefile +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + # adjusting the tcl script location + mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.tcl ${pkgdir}/lib/udev/usb_modeswitch.tcl || return 1 + rmdir ${pkgdir}/lib/udev/usb_modeswitch || return 1 + mv ${pkgdir}/lib/udev/usb_modeswitch.tcl ${pkgdir}/lib/udev/usb_modeswitch || return 1 + + # installing data + cd $srcdir/usb-modeswitch-data-${_pkgdata} || return 1 + make DESTDIR=$pkgdir install || return 1 + # installing config + cp $srcdir/usb_modeswitch.setup $pkgdir/etc/ || return 1 +} + +md5sums="071cb300d00938bfe20025c654303d92 usb-modeswitch-1.1.2.tar.bz2 +659c9633513fa2f84465244a50c351b3 usb-modeswitch-data-20100418.tar.bz2 +9a25756669937ac86774bb55733f09cd usb_modeswitch.setup" -- cgit v1.2.3 From 3484a0f87b22469069a971d68baf853e3298b4aa Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Tue, 22 Jun 2010 11:14:26 +0000 Subject: testing/libusb-compat: needs libusb --- testing/libusb-compat/APKBUILD | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'testing') diff --git a/testing/libusb-compat/APKBUILD b/testing/libusb-compat/APKBUILD index 48143085dd..d36933b66b 100644 --- a/testing/libusb-compat/APKBUILD +++ b/testing/libusb-compat/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="Compatibility library for use by user level applications to access USB url="http://www.libusb.org/" license="LGPL v2.1" depends= -makedepends= +makedepends="libusb-dev" install= subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" @@ -15,7 +15,6 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - # apply patches here } build() { @@ -30,10 +29,6 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install - - # remove the 2 lines below (and this) if there is no init.d script - # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } md5sums="570ac2ea085b80d1f74ddc7c6a93c0eb libusb-compat-0.1.3.tar.bz2" -- cgit v1.2.3 From ee192f2b39cc4444c7e9256d3040f3c8f298bafe Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 22 Jun 2010 15:05:47 +0000 Subject: testing/kamailio: added presence subpackage --- testing/kamailio/APKBUILD | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'testing') diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index 2f8007ee22..3ca4e5bade 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=kamailio pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" @@ -12,7 +12,7 @@ depends= makedepends="bison flex expat-dev postgresql-dev pcre-dev libxml2-dev curl-dev unixodbc-dev confuse-dev" install= -subpackages="$pkgname-doc $pkgname-postgres +subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence $pkgname-mediaproxy $pkgname-unixodbc" source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz kamailio.cfg @@ -23,7 +23,12 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src. " _builddir="$srcdir"/$pkgname-$pkgver -_modules="db_postgres mediaproxy db_unixodbc carrierroute xmlrpc" +# Makefile does not handle newline +_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo" + +_modules="db_postgres mediaproxy db_unixodbc carrierroute xmlrpc tm $_presence" + + prepare() { cd "$_builddir" patch -p1 -i "$srcdir"/kamailio-3-backslash.patch || return 1 @@ -55,7 +60,6 @@ build() { cfg_target=/etc/kamailio/ \ MODS_MYSQL=yes \ MODS_PCRE=yes \ - MODS_PRESENCE=yes \ MODS_RADIUS= \ TLS= \ include_modules="$_modules" \ @@ -68,7 +72,6 @@ package() { cfg_target=/etc/kamailio/ \ MODS_MYSQL=yes \ MODS_PCRE=yes \ - MODS_PRESENCE=yes \ MODS_RADIUS= \ TLS= \ include_modules="$_modules" \ @@ -128,10 +131,8 @@ pcre() { } presence() { - pkgdesc="Precense support for kamailio" - _mv_mod presence presence_xml presence_mwi pua pua_bla pua_mi \ - pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo \ - pua_dialoginfo + pkgdesc="Presence support for kamailio" + _mv_mod_k $_presence } mediaproxy() { -- cgit v1.2.3 From 465cf33483bf57bb455b656050e1c2e9fe761af4 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 07:52:25 +0000 Subject: testing/kamailio: fix default config from nangel. fixes #362 --- testing/kamailio/APKBUILD | 4 ++-- testing/kamailio/kamailio.cfg | 54 +++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'testing') diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index 3ca4e5bade..db7af6dac5 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=kamailio pkgver=3.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" @@ -148,7 +148,7 @@ unixodbc() { } md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz -865979ca14a727e99e0de5ca2426603f kamailio.cfg +a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg 81100c479890a2a8c2628db22fdd1a0c kamailio.initd c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install 3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install diff --git a/testing/kamailio/kamailio.cfg b/testing/kamailio/kamailio.cfg index 5a45cfdbbf..1558cce9ca 100644 --- a/testing/kamailio/kamailio.cfg +++ b/testing/kamailio/kamailio.cfg @@ -1,13 +1,14 @@ -# Demonstration Kamailio Configuration for AlpineLinux - +# Sample Kamailio Configuration +# 23 June 2010 - For Alpine Linux +# Accepts all registrations; routes calls to any registered AOR #-------------------------------------------------------- # Section 1: Global Definitions #-------------------------------------------------------- -debug = 3 +debug = 2 fork = yes log_stderror = no -listen = 0.0.0.0 +# listen = 0.0.0.0 port = 5060 children = 4 @@ -15,20 +16,24 @@ dns = no rev_dns = no mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" + #-------------------------------------------------------- # Section 2: Modules #-------------------------------------------------------- -loadmodule "sl.so" loadmodule "tm.so" +loadmodule "sl.so" +loadmodule "tmx.so" loadmodule "rr.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "mi_fifo.so" +loadmodule "pv.so" +loadmodule "xlog.so" #-------------------------------------------------------- -# Section 1: Module Configuration +# Section 3: Module Configuration #-------------------------------------------------------- modparam ( "usrloc", "db_mode", 0 ) @@ -36,26 +41,30 @@ modparam ( "rr", "enable_full_lr", 1 ) modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") #-------------------------------------------------------- -# Section 1: Main Route Block +# Section 4: Main Route Block #-------------------------------------------------------- route - { + { + # Uncomment next line if you want to see + # each incoming message + xlog( "L_INFO", "$rm: $fu -> $ru" ); + if (!mf_process_maxfwd_header("10")) { sl_send_reply("483", "Too Many Hops"); return; } - - if (msg:len > max_len) + + if (msg:len > 4096) { - sl_send_reply("513", "Message Overflow"); + sl_send_reply("513", "Message too big" ); return; } if (method == "REGISTER" ) { - route(2); + route(REGISTER); return; } @@ -66,42 +75,33 @@ route return; } - route(1); + route(RELAY); } #-------------------------------------------------------- -# Section 1: Secondary Route Blocks +# Section 5: Secondary Route Blocks #-------------------------------------------------------- # - Default message handler -route[1] { +route[RELAY] { if (!t_relay()) { sl_reply_error(); } } #- Registration Request -route[2] { +route[REGISTER] { if (!save("location")) { sl_reply_error(); } } #-------------------------------------------------------- -# Section 1: Reply Route Block +# Section 6: Reply Route Block #-------------------------------------------------------- #-------------------------------------------------------- -# Section 1: Failure Route Block +# Section 7: Failure Route Block #-------------------------------------------------------- - - - - - - - - - -- cgit v1.2.3 From eb8d770a77408f127ff2fa138aad5cb07dde8d08 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 09:40:56 +0000 Subject: testing/collectd: add init.d script, fix default conf, fix localstatedir --- testing/collectd/APKBUILD | 18 +++++++++++------- testing/collectd/collectd.initd | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 testing/collectd/collectd.initd (limited to 'testing') diff --git a/testing/collectd/APKBUILD b/testing/collectd/APKBUILD index 2905922a6d..617accbd9d 100644 --- a/testing/collectd/APKBUILD +++ b/testing/collectd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=collectd pkgver=4.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="The system statistics collection daemon" url="http://collectd.org" license="GPL" @@ -14,7 +14,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp $pkgname-curl $pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql $pkgname-mysql $pkgname-network" -source="http://collectd.org/files/collectd-$pkgver.tar.bz2" +source="http://collectd.org/files/collectd-$pkgver.tar.bz2 + collectd.initd" _builddir="$srcdir"/$pkgname-$pkgver @@ -33,11 +34,15 @@ prepare() { build() { cd "$_builddir" ./configure --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/collectd \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --localstate=/var \ || return 1 make || return 1 + # disable network plugin by default since its in a subpackage + sed -i -e 's/^LoadPlugin network/#LoadPlugin network/' \ + src/collectd.conf } package() { @@ -45,9 +50,7 @@ package() { make DESTDIR="$pkgdir" install find "$pkgdir" -name perllocal.pod -delete - # remove the 2 lines below (and this) if there is no init.d script - # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } perl() { @@ -76,4 +79,5 @@ postgresql() { _plugin postgresql; } mysql() { _plugin mysql; } network() { _plugin network; } -md5sums="5753496651c8c84afaea1fe290876bfc collectd-4.9.1.tar.bz2" +md5sums="5753496651c8c84afaea1fe290876bfc collectd-4.9.1.tar.bz2 +13a36ae2f92634b5619ab94224e1b77d collectd.initd" diff --git a/testing/collectd/collectd.initd b/testing/collectd/collectd.initd new file mode 100644 index 0000000000..de5705a032 --- /dev/null +++ b/testing/collectd/collectd.initd @@ -0,0 +1,20 @@ +#!/sbin/runscript + +DAEMON=/usr/sbin/collectd + +depend() { + need net +} + +start() { + ebegin "Starting collectd" + start-stop-daemon --start --exec $DAEMON -- $collectd_options + eend $? +} + +stop () { + ebegin "Stopping collectd" + start-stop-daemon --stop --exec $DAEMON + eend $? +} + -- cgit v1.2.3 From 8efc2b84f3607bd0fcd164ad0aaa1c42783f6cb1 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 09:41:22 +0000 Subject: main/collectd: moved from testing --- testing/collectd/APKBUILD | 83 ----------------------------------------- testing/collectd/collectd.initd | 20 ---------- 2 files changed, 103 deletions(-) delete mode 100644 testing/collectd/APKBUILD delete mode 100644 testing/collectd/collectd.initd (limited to 'testing') diff --git a/testing/collectd/APKBUILD b/testing/collectd/APKBUILD deleted file mode 100644 index 617accbd9d..0000000000 --- a/testing/collectd/APKBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# Contributor: -# Maintainer: -pkgname=collectd -pkgver=4.9.1 -pkgrel=3 -pkgdesc="The system statistics collection daemon" -url="http://collectd.org" -license="GPL" -depends= -makedepends="pkgconfig curl-dev net-snmp-dev postgresql-dev perl-dev - libgcrypt-dev mysql-dev zlib-dev openssl-dev" -install= -subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp $pkgname-curl - $pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql - $pkgname-mysql $pkgname-network" - -source="http://collectd.org/files/collectd-$pkgver.tar.bz2 - collectd.initd" - -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" - - # we need -lm - sed -i -e 's/^collectd_LDADD = \(.*\)/collectd_LDADD = -lm \1/' \ - -e 's/^collectd_nagios_LDADD = \(.*\)/collectd_nagios_LDADD = -lm \1/' src/Makefile.in - - # disable -Werror - sed -i -e 's/-Werror//' src/owniptc/Makefile.in - -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc/collectd \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstate=/var \ - || return 1 - make || return 1 - # disable network plugin by default since its in a subpackage - sed -i -e 's/^LoadPlugin network/#LoadPlugin network/' \ - src/collectd.conf -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install - - find "$pkgdir" -name perllocal.pod -delete - install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname -} - -perl() { - pkgdesc="perl bindings to collectd" - depends="perl" - install -d "$subpkgdir"/usr/lib/ "$subpkgdir"/usr/share - mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ - mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/ -} - -_plugin() { - local mod=$1 - local desc=${2:-$mod} - pkgdesc="$desc pluin for collectd" - depends="collectd" - install -d "$subpkgdir"/usr/lib/collectd - mv "$pkgdir"/usr/lib/collectd/$mod.so "$subpkgdir"/usr/lib/collectd/ -} - -snmp() { _plugin snmp; } -curl() { _plugin curl; } -write_http() { _plugin write_http; } -nginx() { _plugin nginx; } -apache() { _plugin apache; } -postgresql() { _plugin postgresql; } -mysql() { _plugin mysql; } -network() { _plugin network; } - -md5sums="5753496651c8c84afaea1fe290876bfc collectd-4.9.1.tar.bz2 -13a36ae2f92634b5619ab94224e1b77d collectd.initd" diff --git a/testing/collectd/collectd.initd b/testing/collectd/collectd.initd deleted file mode 100644 index de5705a032..0000000000 --- a/testing/collectd/collectd.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript - -DAEMON=/usr/sbin/collectd - -depend() { - need net -} - -start() { - ebegin "Starting collectd" - start-stop-daemon --start --exec $DAEMON -- $collectd_options - eend $? -} - -stop () { - ebegin "Stopping collectd" - start-stop-daemon --stop --exec $DAEMON - eend $? -} - -- cgit v1.2.3 From 6186bbd0bd46751288a5e5568977ba1b39569d0e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:31:25 +0000 Subject: main/gc: moved from testing --- testing/gc/APKBUILD | 38 -------------------------------------- testing/gc/uclibc-getcontext.patch | 11 ----------- 2 files changed, 49 deletions(-) delete mode 100644 testing/gc/APKBUILD delete mode 100644 testing/gc/uclibc-getcontext.patch (limited to 'testing') diff --git a/testing/gc/APKBUILD b/testing/gc/APKBUILD deleted file mode 100644 index 065fba140b..0000000000 --- a/testing/gc/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=gc -pkgver=7.1 -pkgrel=0 -pkgdesc="A garbage collector for C and C++" -url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" -license="GPL" -depends= -makedepends= -subpackages="$pkgname-dev $pkgname-doc libgc++:libgccpp" -source="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-$pkgver.tar.gz - uclibc-getcontext.patch" - -prepare() { - cd "$srcdir"/$pkgname-$pkgver - patch -p1 -i "$srcdir"/uclibc-getcontext.patch || return 1 -} - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr \ - --datadir=/usr/share/doc/gc \ - --enable-cplusplus || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install || return 1 -} - -libgccpp() { - install -d "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/ -} - -md5sums="2ff9924c7249ef7f736ecfe6f08f3f9b gc-7.1.tar.gz -bce75c75bf0cdb295ac0bf7ba0f6e267 uclibc-getcontext.patch" diff --git a/testing/gc/uclibc-getcontext.patch b/testing/gc/uclibc-getcontext.patch deleted file mode 100644 index de48fc0183..0000000000 --- a/testing/gc/uclibc-getcontext.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./mach_dep.c.orig -+++ ./mach_dep.c -@@ -175,7 +175,7 @@ - # if defined(HAVE_PUSH_REGS) - GC_push_regs(); - # elif defined(UNIX_LIKE) && !defined(DARWIN) && !defined(ARM32) && \ -- !defined(HURD) -+ !defined(HURD) && !defined(__UCLIBC__) - /* Older versions of Darwin seem to lack getcontext(). */ - /* ARM Linux often doesn't support a real getcontext(). */ - ucontext_t ctxt; -- cgit v1.2.3 From e0e0f95b5c21ea0aae719559be825fbfc01350be Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:01 +0000 Subject: main/libsigc++: moved from testing --- testing/libsigc++/APKBUILD | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 testing/libsigc++/APKBUILD (limited to 'testing') diff --git a/testing/libsigc++/APKBUILD b/testing/libsigc++/APKBUILD deleted file mode 100644 index 0329b63ae2..0000000000 --- a/testing/libsigc++/APKBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=libsigc++ -pkgver=2.2.8 -pkgrel=0 -pkgdesc="type-safe Signal Framework for C++" -url="http://libsigc.sourceforge.net/" -license="LGPL" -depends= -makedepends="m4 perl" -subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.2/$pkgname-$pkgver.tar.bz2" - -build() { - cd ""$srcdir"/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -md5sums="1198425eab9fd605721a278c651b8dd8 libsigc++-2.2.8.tar.bz2" -- cgit v1.2.3 From ec07a07613ebfb871e15e4da37fa78c0db70d0c7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:01 +0000 Subject: main/glibmm: moved from testing --- testing/glibmm/APKBUILD | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 testing/glibmm/APKBUILD (limited to 'testing') diff --git a/testing/glibmm/APKBUILD b/testing/glibmm/APKBUILD deleted file mode 100644 index e87bffa31b..0000000000 --- a/testing/glibmm/APKBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=glibmm -pkgver=2.24.2 -pkgrel=0 -pkgdesc="C++ wrapper for the GLib toolkit" -url="http://gtkmm.sourceforge.net/" -license="LGPL" -depends= -makedepends="glib-dev libsigc++-dev" -subpackages="$pkgname-dev $pkgname-doc" -depends_dev="libsigc++-dev" -source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2" - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -md5sums="48861fec006c2bd8e301d8e44cd12d3c glibmm-2.24.2.tar.bz2" -- cgit v1.2.3 From 8c9cf58b8dae048cc73cf74deb5005c7a3488783 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:01 +0000 Subject: main/cairomm: moved from testing --- testing/cairomm/APKBUILD | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 testing/cairomm/APKBUILD (limited to 'testing') diff --git a/testing/cairomm/APKBUILD b/testing/cairomm/APKBUILD deleted file mode 100644 index 9942749e0a..0000000000 --- a/testing/cairomm/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=cairomm -pkgver=1.8.4 -pkgrel=0 -pkgdesc="C++ bindings to Cairo vector graphics library" -url="http://www.cairographics.org" -license="LGPL MPL" -depends="" -makedepends="cairo-dev libsigc++-dev perl" -depends_dev="$makedepends" -subpackages="$pkgname-dev $pkgname-doc" -source="http://www.cairographics.org/releases/cairomm-$pkgver.tar.gz" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - cd "$_builddir" - ./configure --prefix=/usr || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 -} - -md5sums="559afbc47484ba3fad265e38a3dafe90 cairomm-1.8.4.tar.gz" -- cgit v1.2.3 From c7d0f1ab3299e58327c9fed456d75d23e35f6897 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:01 +0000 Subject: main/pangomm: moved from testing --- testing/pangomm/APKBUILD | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 testing/pangomm/APKBUILD (limited to 'testing') diff --git a/testing/pangomm/APKBUILD b/testing/pangomm/APKBUILD deleted file mode 100644 index e4ff082e49..0000000000 --- a/testing/pangomm/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=pangomm -pkgver=2.26.2 -pkgrel=0 -pkgdesc="C++ bindings for pango" -url="http://gtkmm.sourceforge.net/" -license="LGPL" -depends="" -makedepends="pango-dev glibmm-dev cairomm-dev" -depends_dev="$makedepends" -subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/pangomm-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 -} - -md5sums="b363b09faf884db8bf8d1458d719ff00 pangomm-2.26.2.tar.bz2" -- cgit v1.2.3 From 9d4754d6b601c25e56dc3fead3a4b7a71345a589 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:01 +0000 Subject: main/gtkmm: moved from testing --- testing/gtkmm/APKBUILD | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 testing/gtkmm/APKBUILD (limited to 'testing') diff --git a/testing/gtkmm/APKBUILD b/testing/gtkmm/APKBUILD deleted file mode 100644 index 6268ca0a3d..0000000000 --- a/testing/gtkmm/APKBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=gtkmm -pkgver=2.20.3 -pkgrel=0 -pkgdesc="C++ wrappers for GTK+" -url="http://gtkmm.sourceforge.net/" -license="LGPL" -depends="" -makedepends="gtk+-dev intltool glibmm-dev pangomm-dev" -depends_dev="atk-dev gtk+-dev glibmm-dev pangomm-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.20/$pkgname-$pkgver.tar.bz2" - -build() { - cd "$srcdir"/gtkmm-$pkgver - ./configure --prefix=/usr || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/gtkmm-$pkgver - make install DESTDIR="$pkgdir" -} -md5sums="c35f236091b4f96fe45c53b4107400a9 gtkmm-2.20.3.tar.bz2" -- cgit v1.2.3 From 9e1b9ea181f23f6f0d290541eb847301385a4d90 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:01 +0000 Subject: main/gsl: moved from testing --- testing/gsl/APKBUILD | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 testing/gsl/APKBUILD (limited to 'testing') diff --git a/testing/gsl/APKBUILD b/testing/gsl/APKBUILD deleted file mode 100644 index fd4ba6ff8c..0000000000 --- a/testing/gsl/APKBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=gsl -pkgver=1.14 -pkgrel=0 -pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" -url="http://www.gnu.org/software/gsl/gsl.html" -license="GPL" -depends= -makedepends= -install= -subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - cd "$_builddir" - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 -} -md5sums="d55e7b141815412a072a3f0e12442042 gsl-1.14.tar.gz" -- cgit v1.2.3 From d20706e1d36c158ac54759032a417985b759cc1c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:02 +0000 Subject: main/py-xml: moved from testing --- testing/py-xml/APKBUILD | 27 --------------------------- testing/py-xml/fix-python2.6.patch | 28 ---------------------------- 2 files changed, 55 deletions(-) delete mode 100644 testing/py-xml/APKBUILD delete mode 100644 testing/py-xml/fix-python2.6.patch (limited to 'testing') diff --git a/testing/py-xml/APKBUILD b/testing/py-xml/APKBUILD deleted file mode 100644 index 1dd549da07..0000000000 --- a/testing/py-xml/APKBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=py-xml -pkgver=0.8.4 -pkgrel=0 -pkgdesc="Python XML parsing library." -url="http://pyxml.sourceforge.net/" -license="custom" -depends= -makedepends="python-dev" -source="http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-$pkgver.tar.gz - fix-python2.6.patch" - -_builddir="$srcdir"/PyXML-$pkgver -build() { - cd "$_builddir" - patch -Np1 -i "$srcdir/fix-python2.6.patch" || return 1 - python setup.py build || return 1 -} - -package() { - cd "$_builddir" - python setup.py install --prefix=/usr --root="$pkgdir" || return 1 - install -D -m644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1 -} - -md5sums="1f7655050cebbb664db976405fdba209 PyXML-0.8.4.tar.gz -4b652e0c866e3cca7e2386e8e383d5ba fix-python2.6.patch" diff --git a/testing/py-xml/fix-python2.6.patch b/testing/py-xml/fix-python2.6.patch deleted file mode 100644 index 7bf1c46fc9..0000000000 --- a/testing/py-xml/fix-python2.6.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py ---- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 -+++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 -@@ -24,8 +24,8 @@ - self._rel = rel - nt = ParsedNodeTest.ParsedNodeTest('node', '') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._step = ParsedStep.ParsedStep(as, nt, ppl) -+ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._step = ParsedStep.ParsedStep(asp, nt, ppl) - return - - def evaluate(self, context): -diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py ---- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 -+++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 -@@ -28,8 +28,8 @@ - self._right = right - nt = ParsedNodeTest.ParsedNodeTest('node','') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._middle = ParsedStep.ParsedStep(as, nt, ppl) -+ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) - - def evaluate(self, context): - res = [] -- cgit v1.2.3 From faf142f1a2ea5d68e2f041ae4e2c75f4c343fbcd Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:02 +0000 Subject: main/lcms: moved from testing --- testing/lcms/APKBUILD | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 testing/lcms/APKBUILD (limited to 'testing') diff --git a/testing/lcms/APKBUILD b/testing/lcms/APKBUILD deleted file mode 100644 index 7d3d4ca994..0000000000 --- a/testing/lcms/APKBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=lcms -pkgver=1.19 -pkgrel=0 -pkgdesc="Lightweight color management development library/engine" -url="http://www.littlecms.com" -license="custom" -depends= -makedepends="tiff-dev jpeg-dev zlib-dev" -subpackages="$pkgname-dev $pkgname-doc liblcms" -source="http://downloads.sourceforge.net/project/lcms/lcms/$pkgver/lcms-$pkgver.tar.gz" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - cd "$_builddir" - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - install -Dm 644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -liblcms() { - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/liblcms.so.* "$subpkgdir"/usr/lib/ -} - -md5sums="8af94611baf20d9646c7c2c285859818 lcms-1.19.tar.gz" -- cgit v1.2.3 From dce23df1693d8a23173ab7dc9ad71c43c9e8e316 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:02 +0000 Subject: main/inkscape: moved from testing --- testing/inkscape/50-poppler-API.patch | 97 ----------------------------------- testing/inkscape/APKBUILD | 53 ------------------- 2 files changed, 150 deletions(-) delete mode 100644 testing/inkscape/50-poppler-API.patch delete mode 100644 testing/inkscape/APKBUILD (limited to 'testing') diff --git a/testing/inkscape/50-poppler-API.patch b/testing/inkscape/50-poppler-API.patch deleted file mode 100644 index b97969de1d..0000000000 --- a/testing/inkscape/50-poppler-API.patch +++ /dev/null @@ -1,97 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 50-poppler-API.patch.dpatch by Kees Cook -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: https://bugs.launchpad.net/inkscape/+bug/487038 - -@DPATCH@ -diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inkscape/src/extension/internal/pdfinput/pdf-parser.cpp ---- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp 2009-10-10 12:17:47.000000000 -0700 -+++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-23 22:34:13.000000000 -0800 -@@ -809,7 +809,7 @@ - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { -- blendingColorSpace = GfxColorSpace::parse(&obj5); -+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); - } - obj5.free(); - if (obj4.dictLookup(const_cast("I"), &obj5)->isBool()) { -@@ -1009,9 +1009,9 @@ - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { -- colorSpace = GfxColorSpace::parse(&obj); -+ colorSpace = GfxColorSpace::parse(&obj, NULL); - } - obj.free(); - if (colorSpace) { -@@ -1032,9 +1032,9 @@ - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { -- colorSpace = GfxColorSpace::parse(&obj); -+ colorSpace = GfxColorSpace::parse(&obj, NULL); - } - obj.free(); - if (colorSpace) { -@@ -1101,7 +1101,7 @@ - builder->updateStyle(state); - } - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } -@@ -1145,7 +1145,7 @@ - builder->updateStyle(state); - } - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } -@@ -1543,7 +1543,7 @@ - double *matrix = NULL; - GBool savedState = gFalse; - -- if (!(shading = res->lookupShading(args[0].getName()))) { -+ if (!(shading = res->lookupShading(args[0].getName(), NULL))) { - return; - } - -@@ -2507,7 +2507,7 @@ - } - } - if (!obj1.isNull()) { -- colorSpace = GfxColorSpace::parse(&obj1); -+ colorSpace = GfxColorSpace::parse(&obj1, NULL); - } else if (csMode == streamCSDeviceGray) { - colorSpace = new GfxDeviceGrayColorSpace(); - } else if (csMode == streamCSDeviceRGB) { -@@ -2592,7 +2592,7 @@ - obj2.free(); - } - } -- maskColorSpace = GfxColorSpace::parse(&obj1); -+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL); - obj1.free(); - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; -@@ -2767,7 +2767,7 @@ - if (obj1.dictLookup(const_cast("S"), &obj2)->isName(const_cast("Transparency"))) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { -- blendingColorSpace = GfxColorSpace::parse(&obj3); -+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); - } - obj3.free(); - if (obj1.dictLookup(const_cast("I"), &obj3)->isBool()) { diff --git a/testing/inkscape/APKBUILD b/testing/inkscape/APKBUILD deleted file mode 100644 index d8c5f2452f..0000000000 --- a/testing/inkscape/APKBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=inkscape -pkgver=0.47 -pkgrel=1 -pkgdesc="A vector-based drawing program - svg compliant" -url="http://inkscape.sourceforge.net/" -license="GPL LGPL" -makedepends=" -poppler-gtk-dev -imagemagick-dev -gtkspell-dev -gc-dev -gtkmm-dev -libxslt-dev -gsl-dev -py-xml -popt-dev -lcms-dev -libxml2-dev -boost-dev -" -depends="desktop-file-utils" -install= -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - 50-poppler-API.patch" - -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" - patch -p1 -i "$srcdir"/50-poppler-API.patch || return 1 -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --with-python \ - --with-perl \ - --without-gnome-vfs \ - --with-xft \ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-dependency-tracking \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 -} -md5sums="916c85b501bcfb0ae61fcf7318f36348 inkscape-0.47.tar.gz -b447272c9b282b49e86dca24c2581065 50-poppler-API.patch" -- cgit v1.2.3 From dd05131056064e64bd0e0638e0dd6809a81840ba Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jun 2010 11:33:34 +0000 Subject: main/lua-lgob: moved from testing --- testing/lua-lgob/APKBUILD | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 testing/lua-lgob/APKBUILD (limited to 'testing') diff --git a/testing/lua-lgob/APKBUILD b/testing/lua-lgob/APKBUILD deleted file mode 100644 index 17a38eaa3e..0000000000 --- a/testing/lua-lgob/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=lua-lgob -pkgver=10.05 -pkgrel=0 -pkgdesc="Set of Lua bindings that uses gobject-instrospection" -url="http://oproj.tuxfamily.org" -license="LGPL" -depends="lua" -makedepends="lua-dev cairo-dev gtk+-dev pango-dev vte-dev gtkspell-dev - webkit-dev atk-dev gstreamer-dev gst-plugins-base-dev poppler-gtk-dev - gtksourceview-dev" -subpackages="$pkgname-dev" -source="http://downloads.tuxfamily.org/oproj/lgob/lgob-$pkgver.tar.bz2" - -# 'codegen', 'common', 'gobject', 'loader', 'cairo', 'gdk', 'gtk', -# 'pango', 'pangocairo', 'vte', 'webkit', 'atk', 'gstreamer', 'gtkspell', -# 'gtksourceview', 'goocanvas', 'poppler', 'clutter', 'cluttergtk' -_mods="codegen common gobject loader cairo gdk gtk pango pangocairo vte webkit - atk gstreamer gtkspell gtksourceview poppler" -build() { - cd "$srcdir"/lgob-$pkgver -} - -package() { - cd "$srcdir"/lgob-$pkgver - for i in $_mods; do - cd $i - make DESTDIR="$pkgdir"/usr \ - && make DESTDIR="$pkgdir"/usr install|| return 1 - cd .. - done -} - -md5sums="ac3eb632d53c8c3d181b317482bacff7 lgob-10.05.tar.bz2" -- cgit v1.2.3 From abf73e8bd980c6583c1ab78aca588c160a5e2b56 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 25 Jun 2010 11:19:08 +0000 Subject: testing/libowfat: new aport reimplementation of libdjb http://www.fefe.de/libowfat/ --- testing/libowfat/APKBUILD | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 testing/libowfat/APKBUILD (limited to 'testing') diff --git a/testing/libowfat/APKBUILD b/testing/libowfat/APKBUILD new file mode 100644 index 0000000000..8e3ee0eca0 --- /dev/null +++ b/testing/libowfat/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: Natanael Copa +pkgname=libowfat +pkgver=0.28 +pkgrel=0 +pkgdesc="reimplementation of libdjb" +url="http://www.fefe.de/libowfat/" +license="GPL" +depends= +makedepends= +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://dl.fefe.de/libowfat-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + make prefix="$pkgdir"/usr MAN3DIR="$pkgdir"/usr/share/man/man3 install + # buffer manpage conflicts with openssl + mv "$pkgdir"/usr/share/man/man3/buffer.3 \ + "$pkgdir"/usr/share/man/man3/owfatbuffer.3 +} + +md5sums="6bbee9a86506419657d87123b7a6f2c1 libowfat-0.28.tar.bz2" -- cgit v1.2.3 From 74184d30e118d06090981b41d3be75d5f53ae381 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 25 Jun 2010 11:22:59 +0000 Subject: testing/opentracker: new aport an open and free bittorrent tracker http://erdgeist.org/arts/software/opentracker/ --- testing/opentracker/APKBUILD | 36 +++++++++++++++++++++++++++ testing/opentracker/opentracker.initd | 38 +++++++++++++++++++++++++++++ testing/opentracker/opentracker.pre-install | 5 ++++ 3 files changed, 79 insertions(+) create mode 100644 testing/opentracker/APKBUILD create mode 100644 testing/opentracker/opentracker.initd create mode 100644 testing/opentracker/opentracker.pre-install (limited to 'testing') diff --git a/testing/opentracker/APKBUILD b/testing/opentracker/APKBUILD new file mode 100644 index 0000000000..61a521d98a --- /dev/null +++ b/testing/opentracker/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: +pkgname=opentracker +pkgver=0_cvs20100625 +pkgrel=0 +pkgdesc="an open and free bittorrent tracker" +url="http://erdgeist.org/arts/software/opentracker/" +license="GPL" +depends= +makedepends= +install="$pkgname.pre-install" +subpackages= +source="http://dev.alpinelinux.org/opentracker/opentracker-$pkgver.tar.gz + opentracker.initd" + +_builddir="$srcdir"/$pkgname +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + install -d "$pkgdir"/usr/bin + make BINDIR="$pkgdir"/usr/bin install || return 1 + install -m644 -D opentracker.conf.sample \ + "$pkgdir"/etc/opentracker/opentracker.conf + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname +} + +md5sums="8d02a6f7a241c6b8c98e2dbde086cfcf opentracker-0_cvs20100625.tar.gz +1e1e687e78959833463ceb55101a3173 opentracker.initd" diff --git a/testing/opentracker/opentracker.initd b/testing/opentracker/opentracker.initd new file mode 100644 index 0000000000..33d2817787 --- /dev/null +++ b/testing/opentracker/opentracker.initd @@ -0,0 +1,38 @@ +#!/sbin/runscript + +# Sample init.d file for alpine linux. + +name=opentracker +daemon=/usr/bin/$name +conf=${opentracker_conf:-/etc/opentracker/opentracker.conf} +pidfile=/var/run/opentracker.pid + +depend() { + need net + after firewall +} + +start() { + ebegin "Starting ${name}" + start-stop-daemon --start --quiet \ + --make-pidfile \ + --pidfile ${pidfile} \ + --background \ + --stdout /dev/null \ + --stderr /dev/null \ + --exec ${daemon} \ + -- \ + -d /var/empty \ + -f $conf \ + -u ${opentracker_user:-opentracker} \ + ${opentracker_opts} + eend $? +} + +stop() { + ebegin "Stopping ${name}" + start-stop-daemon --stop --quiet --pidfile ${pidfile} \ + --exec ${daemon} + eend $? +} + diff --git a/testing/opentracker/opentracker.pre-install b/testing/opentracker/opentracker.pre-install new file mode 100644 index 0000000000..942fcd6706 --- /dev/null +++ b/testing/opentracker/opentracker.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +adduser -D -S -h /var/empty -s /sbin/false opentracker 2>/dev/null +exit 0 + -- cgit v1.2.3 From f7b7bee3e81109a892e43065b6c16cd8c3779502 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 25 Jun 2010 11:28:46 +0000 Subject: testing/opentracker: build fix --- testing/opentracker/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/opentracker/APKBUILD b/testing/opentracker/APKBUILD index 61a521d98a..642b0d0b54 100644 --- a/testing/opentracker/APKBUILD +++ b/testing/opentracker/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="an open and free bittorrent tracker" url="http://erdgeist.org/arts/software/opentracker/" license="GPL" depends= -makedepends= +makedepends="libowfat-dev" install="$pkgname.pre-install" subpackages= source="http://dev.alpinelinux.org/opentracker/opentracker-$pkgver.tar.gz -- cgit v1.2.3 From 78e13c7934f6f1f69df4a3c6674b390791d2a5da Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Mon, 28 Jun 2010 08:51:17 +0000 Subject: testing/sems: upgrade to 1.2.1 --- testing/sems/APKBUILD | 49 +++--- testing/sems/sems.conf | 352 +++++++++++++++++++++++++++++++++++++++++ testing/sems/sems.initd | 27 ++++ testing/sems/sems.post-install | 6 + testing/sems/sems.pre-install | 5 + 5 files changed, 421 insertions(+), 18 deletions(-) create mode 100644 testing/sems/sems.conf create mode 100644 testing/sems/sems.initd create mode 100644 testing/sems/sems.post-install create mode 100644 testing/sems/sems.pre-install (limited to 'testing') diff --git a/testing/sems/APKBUILD b/testing/sems/APKBUILD index 2f1e6ee055..9d16fc8336 100644 --- a/testing/sems/APKBUILD +++ b/testing/sems/APKBUILD @@ -6,12 +6,12 @@ pkgrel=0 pkgdesc="High performance, extensible media server for SIP (RFC3261) based VoIP services" url="http://iptel.org/sems/" license="GPL-2" -depends="kamailio" -makedepends="python-dev openssl-dev lame-dev" -install= -subpackages= +install="$pkgname.pre-install $pkgname.post-install" +makedepends="python-dev openssl-dev cmake bash" source="http://ftp.iptel.org/pub/sems/sems-$pkgver.tar.gz 0003-cc-and-cflags.patch + sems.conf + sems.initd " prepare() { @@ -22,37 +22,50 @@ prepare() { patch -p1 -i $i || return 1 done - sed -i -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ - -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ + sed -i -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ + -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ Makefile.defs \ || return 1 + + # Patch for fixin unistd.h + sed -i -e 's:\*\/:\n*\/\n#include :' core/AmArg.cpp + sed -i -e 's:\*\/:\n*\/\n#include :' core/AmMediaProcessor.cpp + sed -i -e 's:\*\/:\n*\/\n#include :' core/AmRtpReceiver.cpp + sed -i -e 's:\*\/:\n*\/\n#include :' core/plug-in/sipctrl/udp_trsp.cpp + sed -i -e 's:\*\/:\n*\/\n#include :' core/plug-in/stats/query_stats.cxx + sed -i -e 's:\*\/:\n*\/\n#include :' apps/annrecorder/AnnRecorder.cpp + sed -i -e 's:\*\/:\n*\/\n#include :' apps/callback/CallBack.cpp + sed -i -e 's:\*\/:\n*\/\n#include :' apps/diameter_client/ServerConnection.cpp + sed -i -e 's:\*\/:\n*\/\n#include :' apps/dsm/mods/mod_sys/ModSys.cpp } build() { cd "$srcdir"/$pkgname-$pkgver - make PREFIX=/usr \ - cfg-dir=/etc/sems/ \ - CC="$CC" CXX="$CXX" \ - exclude_modules+="ivr examples py_sems speex gateway echo g722" \ + make PREFIX=/usr \ + cfg-target=/etc/sems/ \ + exclude_modules+="ivr examples py_sems speex gateway mp3 echo g722" \ WITH_MPG123DECODER=no \ - || return 1 + all || return 1 } package() { cd "$srcdir"/$pkgname-$pkgver - make PREFIX=/usr \ - cfg-dir=/etc/sems/ \ - exclude_modules+="ivr examples py_sems speex gateway echo g722" \ + + make PREFIX=/usr \ DESTDIR="$pkgdir" \ + cfg-target=/etc/sems/ \ + cfg-prefix="$pkgdir" \ + exclude_modules+="ivr examples py_sems speex gateway mp3 echo g722" \ WITH_MPG123DECODER=no \ install || return 1 - # remove the 2 lines below (and this) if there is no init.d script -# install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname -# install -m644 -D "$srcdir"//$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/sems/$pkgname.conf } md5sums="f0545c0708849e1a723d453244c2a79e sems-1.2.1.tar.gz -0054e6ed7e11393e71204876179d3199 0003-cc-and-cflags.patch" +0054e6ed7e11393e71204876179d3199 0003-cc-and-cflags.patch +8b74528c8605b7adb01a0133fcd0c247 sems.conf +2e738c6402eb1fbceb279cf050a9090f sems.initd" diff --git a/testing/sems/sems.conf b/testing/sems/sems.conf new file mode 100644 index 0000000000..5e0ba4935e --- /dev/null +++ b/testing/sems/sems.conf @@ -0,0 +1,352 @@ +# $Id: sems.conf.sample 1541 2009-10-14 12:00:58Z sayer $ +# +# sems.conf.sample +# +# Sip Express Media Server (sems) +# +# sample configuration file +# +# +# whitespaces (spaces and tabs) are ignored +# comments start with a "#" and may be used inline +# +# example: option=value # i like this option +# +# @filename includes mod_config_path/filename +# @/absolute/path/to/file includes file + +############################################################ +# Network configuration + +# optional parameter: media_ip=| +# +# - this informs SEMS about the IP address or interface that +# SEMS uses to send and receive media. If not set, defaults +# to first non-loopback interface. +# +# Examples: +# media_ip=10.0.0.34 +# media_ip=eth0 + +# optional parameter: sip_ip= +# +# - this informs SEMS about the SIP IP where its SIP stack is +# bound to or should be bound to. If 'sipctrl' SIP stack is used, +# the SIP stack will bind to this address. This also sets +# the value used for contact header in outgoing calls and +# registrations. If not set, defaults to first non-loopback +# interface. +# +# Example: +# sip_ip=10.0.0.34 +# + +# optional parameter: public_ip= +# +# - when running SEMS behind certain simple NAT configurations, +# you can use this parameter to inform SEMS of its public IP +# address. If this parameter is set, SEMS will write this value +# into SDP bodies. +# If this parameter is not set, the local IP address is used. +# N.B., there is no support for port translation; the local +# RTP port is advertised in SDP in either case. +# +# Example: +# public_ip=75.101.219.48 +# + +# optional parameter: sip_port= +# +# - this informs SEMS about the port where its SIP stack is +# bound to or should be bound to. SEMS needs this information +# to correctly set the contact header in outgoing calls +# and registrations. Should be set to equal the 'port' +# configuration option in ser_sems.cfg. +# This does not need to be set if sipctrl SIP stack, outgoing +# calls and registrations from SEMS are not used. +# +# default: 5060 +# +sip_port=5080 + +# optional parameter: outbound_proxy=uri +# +# - this sets a next hop for calls and registrations outgoing +# from SEMS. This does not apply to requests in a dialog that +# is initiated by someone else and incoming to SEMS, as in +# this case the next_hop is taken by SEMS from the incoming +# request that established the dialog. +# If this is not set (default setting), then for dialogs +# initiated by SEMS the r-uri is resolved and the request +# is sent there directly. +# This is resolved by the SIP stack with DNS if a name is given. +# Warning: If the value set here can not be resolved, no +# requests will be sent out at all! +# +# default: empty +# +# Example: +# outbound_proxy=sip:proxy.mydomain.net + +# optional parameter: rtp_low_port= +# +# - sets lowest for RTP used port +rtp_low_port=10000 + +# optional parameter: rtp_high_port= +# +# - sets highest for RTP used port +rtp_high_port=60000 + +############################################################ +# modules and application configuration +# +# Configuration of plugin (module) loading: +# - if load_plugins is set, only those are loaded. +# - if load_plugins is not set, all modules in the plugin_path +# directory are loaded, except those which are listed +# in exclude_plugins. +# + +# optional parameter: plugin_path= +# +# - sets the path to the plug-ins' binaries +# - may be absolute or relative to CWD +plugin_path=/usr/lib/sems/plug-in/ + +# optional parameter: load_plugins= +# +# semicolon-separated list of modules to load. +# If empty, all modules in plugin_path are loaded. +# One of [sipctrl,unixsockctrl,binrpcctrl] must be loaded. +# +# example for announcement with only g711 and ilbc codecs +# load_plugins=wav;ilbc;announcement;sipctrl + +# optional parameter: exclude_plugins= +# +# semicolon-separated list of modules to exclude from loading +# ('blacklist'). If empty, all modules in plugin_path are loaded. +# This has only effect it load_plugins is not set. +# +# o binrpcctrl and unixsockctrl: excluded as sipctrl is default ctrl +# o precoded_announce: no precoded sample files present +exclude_plugins=binrpcctrl;unixsockctrl;precoded_announce + +# optional parameter: application +# +# This controls which application is to be executed if there +# is no explicit application requested from the SIP stack +# (i.e. unixsockctrl and second parameter of t_write_unix). +# +# This can be one of +# $(ruri.user) - user part of ruri is taken as application, +# e.g. sip:announcement@host +# $(ruri.param) - uri parameter "app", e.g. +# sip:joe@host.net;app=announcement +# $(apphdr) - the value of the P-App-Name header is used +# +# $(mapping) - regex=>application mapping is read from +# app_mapping.conf (see app_mapping.conf) +# - application name configured here, e.g. +# application=announcement +# +# examples: +# application = conference +# application = $(mapping) +# application = $(ruri.user) +# application = $(ruri.param) +application = $(apphdr) + +# parameter: plugin_config_path= +# +# - in this path configuration files of the applications +# (e.g. announcement.conf) are searched +plugin_config_path=/etc/sems/etc/ + +# optional parameter: exclude_payloads= +# +# semicolon-separated list of payloads to exclude from loading +# ('blacklist'). +# +# For example, to only use low bandwidth codecs: +# exclude_payloads=PCMU;PCMA;G726-40;G726-32;G721;L16 +# or, to use only codecs which are not CPU-intensive: +# exclude_payloads=iLBC;speex; +# only use G711 (exclude everything else): +# exclude_payloads=iLBC;speex;G726-40;G726-32;G721;G726-24;G726-16;GSM;L16 + +############################################################ +# logging and running + +# optional parameter: fork={yes|no} +# +# - specifies if sems should run in daemon mode (background) +# (fork=no is the same as -E) +fork=yes + +# optional parameter: stderr={yes|no} +# +# - debug mode: do not fork and log to stderr +# (stderr=yes is the same as -E) +stderr=no + +# optional parameter: loglevel={0|1|2|3} +# +# - sets log level (error=0, warning=1, info=2, debug=3) +# (same as -D) +loglevel=2 + +# optional parameter: syslog_facility={DAEMON|USER|LOCAL[0-7]} +# +# - sets the log facility that is used for syslog. Using this, +# the log can for example be filtered into a special file +# by the syslog daemon. +# +# Default: DAEMON +# +# Example: +# syslog_facility=LOCAL0 + +# optional parameter: log_sessions=[yes|no] +# +# Default: no +# +# If log_sessions=yes is set, INFO level log messages are generated +# for each session when it is started and stopped. +# +# log_sessions=yes + +# optional parameter: log_events=[yes|no] +# +# Default: no +# +# If log_eventy=yes is set, generic DBG level log messages are +# generated for each event that is posted into an event queue. +# +# log_events=yes + + +############################################################ +# tuning + +# optional parameter: media_processor_threads= +# +# - controls how many threads should be created that +# process media - on single-processor systems set this +# parameter to 1 (default), on MP systems to a higher +# value +# +# media_processor_threads=1 + + +# optional parameter: session_limit=;; +# +# - this sets a maximum active session limit. If that limit is +# reached, no further calls are accepted, but the error reply +# with err code/err reason is sent out. +# +# Default: 0 (None) +# +# Example: +# session_limit="1000;503;Server overload" + +# optional parameter: options_session_limit=;; +# +# - this sets a custom response to OPTIONS, if the session count reaches +# a certain limit. This way health monitor could raise an alarm to syste +# administrator. +# +# Default: 0 (None) +# +# Example: +# options_session_limit="900;503;Warning, server soon overloaded" + + +# optional parameter: dead_rtp_time= +# +# - if != 0, after this time (in seconds) of no RTP +# a session is considered dead and stopped. If set +# to 0 no check is done for rtp timeout. +# +# default=300 (5 minutes) +# +# Examples: +# # disable RTP timeout +# dead_rtp_time=0 +# # RTP timeout after 10 seconds +# dead_rtp_time=10 + +# optional parameter: use_default_signature={yes|no} +# +# - use a Server/User-Agent header with the SEMS server +# signature and version. +# Set server_signature=0 in ser_sems.cfg if you use SER +# as SIP stack. +# +# default=no +# +use_default_signature=yes + +# optional parameter: signature= +# +# - use a Server/User-Agent header with a custom user agent +# signature. +# Overridden by default signature if +# use_default_signature is set. +# Set server_signature=0 in ser_sems.cfg if you use it. +# +# +# signature="SEMS media server 1.0" + +# optional parameter: single_codec_in_ok={yes|no} +# +# - use single codec in 200 OK response +# +# default=no +# +# single_codec_in_ok=no + +# optional parameter: codec_order=codec_name_1,codec_name2,... +# +# - Codec order used when sending INVITE requests. Codecs in codec_order +# will be on the top of the list followed by other supported codecs +# (if any). +# +# default=empty +# +# codec_order=iLBC,GSM + +# optional parameter: ignore_rtpxheaders={yes|no} +# +# - if this is set to yes, RTP extension headers (e.g. when using ZRTP) +# are ignored. If set to no, the whole RTP packets with extension +# headers will be ignored and a debug message is printed on every +# received packet. +# +# default=no +# +# ignore_rtpxheaders=yes + +# optional parameter: dtmf_detector={spandsp|internal} +# +# sets inband DTMF detector to use. spandsp support must be compiled in +# for this to have effect if dtmf_detector=spandsp. +# +# default: internal +# +# dtmf_detector=spandsp + +# optional parameter: unhandled_reply_loglevel={error|warn|info|debug|no} +# +# the default application logic implemented in the applications is to stop +# the session right after sending BYE, without waiting for a reply. this +# leads to many log entries of the form +# ERROR: [b6fa6bb0] handleSipMsg (AmSipDispatcher.cpp:48): unhandled +# reply: [code:200;phrase:[OK];... ] +# +# This parameter sets the log lovel of unhandled positive (200 class) replies. +# +# default: error +# +# unhandled_reply_loglevel=info diff --git a/testing/sems/sems.initd b/testing/sems/sems.initd new file mode 100644 index 0000000000..9cf98a185e --- /dev/null +++ b/testing/sems/sems.initd @@ -0,0 +1,27 @@ +#!/sbin/runscript + +daemon=/usr/sbin/sems +pidfile=/var/run/sems/sems.pid +conffile=/etc/sems/sems.conf + +depend() { + need net + after firewall +} + +start() { + ebegin "Starting sems" + start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \ + -- \ + -u sems \ + -g sems \ + -P $pidfile \ + -f $conffile + eend $? +} + +stop() { + ebegin "Stopping sems" + start-stop-daemon --stop --quiet --pidfile $pidfile + eend $? +} diff --git a/testing/sems/sems.post-install b/testing/sems/sems.post-install new file mode 100644 index 0000000000..cd800bdcd6 --- /dev/null +++ b/testing/sems/sems.post-install @@ -0,0 +1,6 @@ +#!/bin/sh + +mkdir -p /var/run/sems 2>/dev/null +chown -R sems:sems /var/run/sems 2>/dev/null +chgrp sems /etc/sems/sems.cfg 2>/dev/null +exit 0 diff --git a/testing/sems/sems.pre-install b/testing/sems/sems.pre-install new file mode 100644 index 0000000000..3e82578a3e --- /dev/null +++ b/testing/sems/sems.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +adduser -H -h /var/empty -s /bin/false -D sems 2>/dev/null + +exit 0 -- cgit v1.2.3 From 5c80f7c990e207fbbdb58e32255670cfd4b28605 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 30 Jun 2010 08:03:37 +0000 Subject: testing/opentracker: do not create the homedir for opentracker user we dont want change permissions on /var/empty --- testing/opentracker/APKBUILD | 2 +- testing/opentracker/opentracker.pre-install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/opentracker/APKBUILD b/testing/opentracker/APKBUILD index 642b0d0b54..681d552639 100644 --- a/testing/opentracker/APKBUILD +++ b/testing/opentracker/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=opentracker pkgver=0_cvs20100625 -pkgrel=0 +pkgrel=1 pkgdesc="an open and free bittorrent tracker" url="http://erdgeist.org/arts/software/opentracker/" license="GPL" diff --git a/testing/opentracker/opentracker.pre-install b/testing/opentracker/opentracker.pre-install index 942fcd6706..c6fc95ed1b 100644 --- a/testing/opentracker/opentracker.pre-install +++ b/testing/opentracker/opentracker.pre-install @@ -1,5 +1,5 @@ #!/bin/sh -adduser -D -S -h /var/empty -s /sbin/false opentracker 2>/dev/null +adduser -D -S -H -h /var/empty -s /sbin/false opentracker 2>/dev/null exit 0 -- cgit v1.2.3 From 0235b2c2cc3bd9fe9203de4ad087df8c9555bad2 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 30 Jun 2010 12:50:24 +0000 Subject: testing/py-crypto: use gmp-dev instead of gmp5-dev --- testing/py-crypto/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/py-crypto/APKBUILD b/testing/py-crypto/APKBUILD index 75f31dd658..a1beecb8fd 100644 --- a/testing/py-crypto/APKBUILD +++ b/testing/py-crypto/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa pkgname=py-crypto pkgver=2.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of cryptographic algorithms and protocols, implemented for use from Python." url="http://www.amk.ca/python/code/crypto.html" license="GPL" depends="python" -makedepends="gmp5-dev python-dev" +makedepends="gmp-dev python-dev" source="http://www.amk.ca/files/python/crypto/pycrypto-$pkgver.tar.gz" _builddir="$srcdir"/pycrypto-$pkgver -- cgit v1.2.3 From e00b3c4c5b38263565b62a6674516f8492b2a532 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 30 Jun 2010 15:55:05 +0000 Subject: main/libowfat: moved from testing --- testing/libowfat/APKBUILD | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 testing/libowfat/APKBUILD (limited to 'testing') diff --git a/testing/libowfat/APKBUILD b/testing/libowfat/APKBUILD deleted file mode 100644 index 8e3ee0eca0..0000000000 --- a/testing/libowfat/APKBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=libowfat -pkgver=0.28 -pkgrel=0 -pkgdesc="reimplementation of libdjb" -url="http://www.fefe.de/libowfat/" -license="GPL" -depends= -makedepends= -install= -subpackages="$pkgname-dev $pkgname-doc" -source="http://dl.fefe.de/libowfat-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" -} - -build() { - cd "$_builddir" - make || return 1 -} - -package() { - cd "$_builddir" - make prefix="$pkgdir"/usr MAN3DIR="$pkgdir"/usr/share/man/man3 install - # buffer manpage conflicts with openssl - mv "$pkgdir"/usr/share/man/man3/buffer.3 \ - "$pkgdir"/usr/share/man/man3/owfatbuffer.3 -} - -md5sums="6bbee9a86506419657d87123b7a6f2c1 libowfat-0.28.tar.bz2" -- cgit v1.2.3 From 2da022a8f0642c8990ba999256fc8b9ccada29f2 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 30 Jun 2010 15:55:28 +0000 Subject: main/opentracker: moved from testing fixes #190 --- testing/opentracker/APKBUILD | 36 --------------------------- testing/opentracker/opentracker.initd | 38 ----------------------------- testing/opentracker/opentracker.pre-install | 5 ---- 3 files changed, 79 deletions(-) delete mode 100644 testing/opentracker/APKBUILD delete mode 100644 testing/opentracker/opentracker.initd delete mode 100644 testing/opentracker/opentracker.pre-install (limited to 'testing') diff --git a/testing/opentracker/APKBUILD b/testing/opentracker/APKBUILD deleted file mode 100644 index 681d552639..0000000000 --- a/testing/opentracker/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: -# Maintainer: -pkgname=opentracker -pkgver=0_cvs20100625 -pkgrel=1 -pkgdesc="an open and free bittorrent tracker" -url="http://erdgeist.org/arts/software/opentracker/" -license="GPL" -depends= -makedepends="libowfat-dev" -install="$pkgname.pre-install" -subpackages= -source="http://dev.alpinelinux.org/opentracker/opentracker-$pkgver.tar.gz - opentracker.initd" - -_builddir="$srcdir"/$pkgname -prepare() { - cd "$_builddir" -} - -build() { - cd "$_builddir" - make || return 1 -} - -package() { - cd "$_builddir" - install -d "$pkgdir"/usr/bin - make BINDIR="$pkgdir"/usr/bin install || return 1 - install -m644 -D opentracker.conf.sample \ - "$pkgdir"/etc/opentracker/opentracker.conf - install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname -} - -md5sums="8d02a6f7a241c6b8c98e2dbde086cfcf opentracker-0_cvs20100625.tar.gz -1e1e687e78959833463ceb55101a3173 opentracker.initd" diff --git a/testing/opentracker/opentracker.initd b/testing/opentracker/opentracker.initd deleted file mode 100644 index 33d2817787..0000000000 --- a/testing/opentracker/opentracker.initd +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/runscript - -# Sample init.d file for alpine linux. - -name=opentracker -daemon=/usr/bin/$name -conf=${opentracker_conf:-/etc/opentracker/opentracker.conf} -pidfile=/var/run/opentracker.pid - -depend() { - need net - after firewall -} - -start() { - ebegin "Starting ${name}" - start-stop-daemon --start --quiet \ - --make-pidfile \ - --pidfile ${pidfile} \ - --background \ - --stdout /dev/null \ - --stderr /dev/null \ - --exec ${daemon} \ - -- \ - -d /var/empty \ - -f $conf \ - -u ${opentracker_user:-opentracker} \ - ${opentracker_opts} - eend $? -} - -stop() { - ebegin "Stopping ${name}" - start-stop-daemon --stop --quiet --pidfile ${pidfile} \ - --exec ${daemon} - eend $? -} - diff --git a/testing/opentracker/opentracker.pre-install b/testing/opentracker/opentracker.pre-install deleted file mode 100644 index c6fc95ed1b..0000000000 --- a/testing/opentracker/opentracker.pre-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -adduser -D -S -H -h /var/empty -s /sbin/false opentracker 2>/dev/null -exit 0 - -- cgit v1.2.3 From 9231365da35bfe61172dcea6eb416866f12712bd Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 1 Jul 2010 11:18:30 +0000 Subject: testing/libtirpc: disable auth_des completely It had some unresolved symbols. --- testing/libtirpc/APKBUILD | 22 ++++++++++++++------ testing/libtirpc/libtirpc-no-des.patch | 38 ++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 testing/libtirpc/libtirpc-no-des.patch (limited to 'testing') diff --git a/testing/libtirpc/APKBUILD b/testing/libtirpc/APKBUILD index d77553d5b2..ecac43adc3 100644 --- a/testing/libtirpc/APKBUILD +++ b/testing/libtirpc/APKBUILD @@ -1,24 +1,33 @@ # Maintainer: Natanael Copa pkgname=libtirpc pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Transport Independent RPC library (SunRPC replacement)" url="http://libtirpc.sourceforge.net/" license="GPL2" depends= -makedepends="libgssglue-dev heimdal-dev" +makedepends="libgssglue-dev heimdal-dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - nis.h" + nis.h + libtirpc-no-des.patch" depends_dev="libgssglue-dev heimdal-dev" prepare() { cd "$srcdir"/$pkgname-$pkgver + for i in $source; do + case $i in + *.patch) + msg "Applying $i" + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac + done # uclibc does not provide nis.h so provide our own mkdir src/rpcsvc cp "$srcdir"/nis.h src/rpcsvc/ - # we dont have nsl - sed -i -e "/^libtirpc_la_LDFLAGS/s/-lnsl//" src/Makefile.in + + sh bootstrap && libtoolize } build() { @@ -34,4 +43,5 @@ package() { install -D -m644 doc/etc_netconfig "$pkgdir"/etc/netconfig } md5sums="d77eb15f464bf9d6e66259eaf78b2a4e libtirpc-0.2.1.tar.bz2 -082dff1bc78bdcbac6d305c1534fe3c0 nis.h" +082dff1bc78bdcbac6d305c1534fe3c0 nis.h +e386d2893527ed313686eca6314d6675 libtirpc-no-des.patch" diff --git a/testing/libtirpc/libtirpc-no-des.patch b/testing/libtirpc/libtirpc-no-des.patch new file mode 100644 index 0000000000..8c59de21f8 --- /dev/null +++ b/testing/libtirpc/libtirpc-no-des.patch @@ -0,0 +1,38 @@ +--- ./src/Makefile.am.orig ++++ ./src/Makefile.am +@@ -40,7 +40,7 @@ + # release number of your package. This is an abuse that only fosters + # misunderstanding of the purpose of library versions." + # +-libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 ++libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 + + libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ + clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ +@@ -50,7 +50,7 @@ + rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ + rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ + svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ +- auth_time.c auth_des.c authdes_prot.c ++ auth_time.c + + ## XDR + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c +--- ./src/rpc_soc.c.orig ++++ ./src/rpc_soc.c +@@ -479,6 +479,7 @@ + (resultproc_t) rpc_wrap_bcast, "udp"); + } + ++#if 0 + /* + * Create the client des authentication object. Obsoleted by + * authdes_seccreate(). +@@ -511,6 +512,7 @@ + return (dummy); + } + ++#endif + /* + * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() + */ -- cgit v1.2.3 From 445ca2557114b18482ed1f9b63521e6be7dc073a Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 1 Jul 2010 11:27:11 +0000 Subject: testing/rpcbind: new aport portmap replacement which supports RPC over various protocols http://rpcbind.sourceforge.net --- testing/rpcbind/0001-uclibc-nss.patch | 28 ++++++++++++ testing/rpcbind/0002-uclibc-rpcsvc-defines.patch | 58 ++++++++++++++++++++++++ testing/rpcbind/APKBUILD | 42 +++++++++++++++++ testing/rpcbind/rpcbind.confd | 4 ++ testing/rpcbind/rpcbind.initd | 25 ++++++++++ 5 files changed, 157 insertions(+) create mode 100644 testing/rpcbind/0001-uclibc-nss.patch create mode 100644 testing/rpcbind/0002-uclibc-rpcsvc-defines.patch create mode 100644 testing/rpcbind/APKBUILD create mode 100644 testing/rpcbind/rpcbind.confd create mode 100644 testing/rpcbind/rpcbind.initd (limited to 'testing') diff --git a/testing/rpcbind/0001-uclibc-nss.patch b/testing/rpcbind/0001-uclibc-nss.patch new file mode 100644 index 0000000000..3685c03b66 --- /dev/null +++ b/testing/rpcbind/0001-uclibc-nss.patch @@ -0,0 +1,28 @@ +From b8f0d7b7318ba344c25785d6f5cf3f8de98012d4 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 2 Feb 2010 09:36:03 +0000 +Subject: [PATCH 1/2] uclibc-nss + +--- + src/rpcbind.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/rpcbind.c b/src/rpcbind.c +index 525ffba..1fe1a60 100644 +--- a/src/rpcbind.c ++++ b/src/rpcbind.c +@@ -67,7 +67,11 @@ + #include + #include + #include ++#if defined(__UCLIBC__) ++#define __nss_configure_lookup(x,y) ++#else + #include ++#endif + #include "config.h" + #include "rpcbind.h" + +-- +1.6.6.1 + diff --git a/testing/rpcbind/0002-uclibc-rpcsvc-defines.patch b/testing/rpcbind/0002-uclibc-rpcsvc-defines.patch new file mode 100644 index 0000000000..e394966f5c --- /dev/null +++ b/testing/rpcbind/0002-uclibc-rpcsvc-defines.patch @@ -0,0 +1,58 @@ +From 077add040c2e30d3ac507362f4afe350f47be027 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 2 Feb 2010 09:47:57 +0000 +Subject: [PATCH 2/2] uclibc-rpcsvc-defines + +--- + src/security.c | 28 ++++++++++++++++++++++++++++ + 1 files changed, 28 insertions(+), 0 deletions(-) + +diff --git a/src/security.c b/src/security.c +index 0edeac6..e9fed55 100644 +--- a/src/security.c ++++ b/src/security.c +@@ -20,6 +20,32 @@ + /* + * XXX for special case checks in check_callit. + */ ++#if defined(__UCLIBC__) ++ ++#define MOUNTPROC_MNT 1 ++#define MOUNTPROC_UMNT 3 ++ ++#define NFS_PROGRAM 100003 ++#define YPPROG 100004 ++#define MOUNTPROG 100005 ++#define YPBINDPROG 100007 ++#define YPPASSWDPROG 100009 ++#define RQUOTAPROG 100011 ++ ++#define YPPROC_NULL 0 ++#define YPPROC_DOMAIN 1 ++#define YPPROC_DOMAIN_NONACK 2 ++#define YPPROC_MATCH 3 ++#define YPPROC_FIRST 4 ++#define YPPROC_NEXT 5 ++#define YPPROC_XFR 6 ++#define YPPROC_CLEAR 7 ++#define YPPROC_ALL 8 ++ ++#define YPBINDPROC_SETDOM 2 ++ ++#else ++ + #include + #include + #include +@@ -27,6 +53,8 @@ + #include + #include + ++#endif ++ + #include "rpcbind.h" + + #ifdef LIBWRAP +-- +1.6.6.1 + diff --git a/testing/rpcbind/APKBUILD b/testing/rpcbind/APKBUILD new file mode 100644 index 0000000000..3574ffece0 --- /dev/null +++ b/testing/rpcbind/APKBUILD @@ -0,0 +1,42 @@ +# Maintainer: Natanael Copa +pkgname=rpcbind +pkgver=0.2.0 +pkgrel=0 +pkgdesc="portmap replacement which supports RPC over various protocols" +url="http://rpcbind.sourceforge.net" +license="custom" +depends= +makedepends="libtirpc-dev" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + 0001-uclibc-nss.patch + 0002-uclibc-rpcsvc-defines.patch + rpcbind.initd + rpcbind.confd" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + patch -p1 -i "$i" || return 1 + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr --bindir=/sbin + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + install -Dm755 "$srcdir"/rpcbind.initd "$pkgdir"/etc/init.d/rpcbind + install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING +} +md5sums="1a77ddb1aaea8099ab19c351eeb26316 rpcbind-0.2.0.tar.bz2 +6d9718d8bdab633ef7cf83225aaed367 0001-uclibc-nss.patch +944234c5ef6902d25bd6dfc95f979ed6 0002-uclibc-rpcsvc-defines.patch +381a2722c69b4597af532381f1ffeae0 rpcbind.initd +1ad5c8dcf432c8f23ba740f4c32a7c60 rpcbind.confd" diff --git a/testing/rpcbind/rpcbind.confd b/testing/rpcbind/rpcbind.confd new file mode 100644 index 0000000000..ddc09172d1 --- /dev/null +++ b/testing/rpcbind/rpcbind.confd @@ -0,0 +1,4 @@ +# /etc/conf.d/rpcbind + +# Options for `rpcbind`. +#RPCBIND_OPTS="-l" diff --git a/testing/rpcbind/rpcbind.initd b/testing/rpcbind/rpcbind.initd new file mode 100644 index 0000000000..897e8e5a88 --- /dev/null +++ b/testing/rpcbind/rpcbind.initd @@ -0,0 +1,25 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/files/rpcbind.initd,v 1.1 2007/12/29 09:13:55 vapier Exp $ + +depend() { + use net + before inetd xinetd + after firewall + provide portmap +} + +start() { + ebegin "Starting rpcbind" + start-stop-daemon --start --quiet --exec /sbin/rpcbind \ + -- ${RPCBIND_OPTS} + eend $? +} + +stop() { + ebegin "Stopping rpcbind" + start-stop-daemon --stop --quiet --exec /sbin/rpcbind + eend $? +} + -- cgit v1.2.3 From 50c6b6ef245d58b7405c42b173f82da205974ccf Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 1 Jul 2010 14:45:07 +0000 Subject: main/libtirpc: moved from testing --- testing/libtirpc/APKBUILD | 47 --- testing/libtirpc/libtirpc-no-des.patch | 38 --- testing/libtirpc/nis.h | 542 --------------------------------- 3 files changed, 627 deletions(-) delete mode 100644 testing/libtirpc/APKBUILD delete mode 100644 testing/libtirpc/libtirpc-no-des.patch delete mode 100644 testing/libtirpc/nis.h (limited to 'testing') diff --git a/testing/libtirpc/APKBUILD b/testing/libtirpc/APKBUILD deleted file mode 100644 index ecac43adc3..0000000000 --- a/testing/libtirpc/APKBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=libtirpc -pkgver=0.2.1 -pkgrel=2 -pkgdesc="Transport Independent RPC library (SunRPC replacement)" -url="http://libtirpc.sourceforge.net/" -license="GPL2" -depends= -makedepends="libgssglue-dev heimdal-dev autoconf automake libtool" -subpackages="$pkgname-dev $pkgname-doc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - nis.h - libtirpc-no-des.patch" - -depends_dev="libgssglue-dev heimdal-dev" -prepare() { - cd "$srcdir"/$pkgname-$pkgver - for i in $source; do - case $i in - *.patch) - msg "Applying $i" - patch -p1 -i "$srcdir"/$i || return 1 - ;; - esac - done - # uclibc does not provide nis.h so provide our own - mkdir src/rpcsvc - cp "$srcdir"/nis.h src/rpcsvc/ - - sh bootstrap && libtoolize -} - -build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-gss - make || return 1 -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR="$pkgdir" install || return 1 - install -D -m644 doc/etc_netconfig "$pkgdir"/etc/netconfig -} -md5sums="d77eb15f464bf9d6e66259eaf78b2a4e libtirpc-0.2.1.tar.bz2 -082dff1bc78bdcbac6d305c1534fe3c0 nis.h -e386d2893527ed313686eca6314d6675 libtirpc-no-des.patch" diff --git a/testing/libtirpc/libtirpc-no-des.patch b/testing/libtirpc/libtirpc-no-des.patch deleted file mode 100644 index 8c59de21f8..0000000000 --- a/testing/libtirpc/libtirpc-no-des.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- ./src/Makefile.am.orig -+++ ./src/Makefile.am -@@ -40,7 +40,7 @@ - # release number of your package. This is an abuse that only fosters - # misunderstanding of the purpose of library versions." - # --libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 -+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 - - libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ - clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ -@@ -50,7 +50,7 @@ - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ - svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c -+ auth_time.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c ---- ./src/rpc_soc.c.orig -+++ ./src/rpc_soc.c -@@ -479,6 +479,7 @@ - (resultproc_t) rpc_wrap_bcast, "udp"); - } - -+#if 0 - /* - * Create the client des authentication object. Obsoleted by - * authdes_seccreate(). -@@ -511,6 +512,7 @@ - return (dummy); - } - -+#endif - /* - * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() - */ diff --git a/testing/libtirpc/nis.h b/testing/libtirpc/nis.h deleted file mode 100644 index a03a25f37b..0000000000 --- a/testing/libtirpc/nis.h +++ /dev/null @@ -1,542 +0,0 @@ -/* - * Sun RPC is a product of Sun Microsystems, Inc. and is provided for - * unrestricted use provided that this legend is included on all tape - * media and as a part of the software program in whole or part. Users - * may copy or modify Sun RPC without charge, but are not authorized - * to license or distribute it to anyone else except as part of a product or - * program developed by the user or with the express written consent of - * Sun Microsystems, Inc. - * - * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE - * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR - * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - * - * Sun RPC is provided with no support and without any obligation on the - * part of Sun Microsystems, Inc. to assist in its use, correction, - * modification or enhancement. - * - * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE - * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC - * OR ANY PART THEREOF. - * - * In no event will Sun Microsystems, Inc. be liable for any lost revenue - * or profits or other special, indirect and consequential damages, even if - * Sun has been advised of the possibility of such damages. - * - * Sun Microsystems, Inc. - * 2550 Garcia Avenue - * Mountain View, California 94043 - */ - -#ifndef _RPCSVC_NIS_H -#define _RPCSVC_NIS_H 1 - -#include -//#include -//#include - -__BEGIN_DECLS - -/* - * nis.h - * - * This file is the main include file for NIS clients. It contains - * both the client library function defines and the various data - * structures used by the NIS service. It includes the file nis_tags.h - * which defines the tag values. This allows the tags to change without - * having to change the nis.x file. - * - * NOTE : THIS FILE IS NOT GENERATED WITH RPCGEN ! SO YOU HAVE TO - * ADD ALL THE CHANGES ON nis_*.x FILES HERE AGAIN ! - * - * I have removed all the Solaris internal structs and variables, - * because they are not supported, Sun changed them between various - * releases and they shouldn't be used in user programs. - * - */ - - -#ifndef __nis_object_h -#define __nis_object_h - -#define NIS_MAXSTRINGLEN 255 -#define NIS_MAXNAMELEN 1024 -#define NIS_MAXATTRNAME 32 -#define NIS_MAXATTRVAL 2048 -#define NIS_MAXCOLUMNS 64 -#define NIS_MAXATTR 16 -#define NIS_MAXPATH 1024 -#define NIS_MAXREPLICAS 128 -#define NIS_MAXLINKS 16 -#define NIS_PK_NONE 0 -#define NIS_PK_DH 1 -#define NIS_PK_RSA 2 -#define NIS_PK_KERB 3 -#define NIS_PK_DHEXT 4 - -struct nis_attr { - char *zattr_ndx; - struct { - u_int zattr_val_len; - char *zattr_val_val; - } zattr_val; -}; -typedef struct nis_attr nis_attr; - -typedef char *nis_name; - -enum zotypes { - BOGUS_OBJ = 0, - NO_OBJ = 1, - DIRECTORY_OBJ = 2, - GROUP_OBJ = 3, - TABLE_OBJ = 4, - ENTRY_OBJ = 5, - LINK_OBJ = 6, - PRIVATE_OBJ = 7, - NIS_BOGUS_OBJ = 0, - NIS_NO_OBJ = 1, - NIS_DIRECTORY_OBJ = 2, - NIS_GROUP_OBJ = 3, - NIS_TABLE_OBJ = 4, - NIS_ENTRY_OBJ = 5, - NIS_LINK_OBJ = 6, - NIS_PRIVATE_OBJ = 7 -}; -typedef enum zotypes zotypes; - -enum nstype { - UNKNOWN = 0, - NIS = 1, - SUNYP = 2, - IVY = 3, - DNS = 4, - X500 = 5, - DNANS = 6, - XCHS = 7, - CDS = 8, -}; -typedef enum nstype nstype; - -struct oar_mask { - uint32_t oa_rights; - zotypes oa_otype; -}; -typedef struct oar_mask oar_mask; - -struct endpoint { - char *uaddr; - char *family; - char *proto; -}; -typedef struct endpoint endpoint; - -struct nis_server { - nis_name name; - struct { - u_int ep_len; - endpoint *ep_val; - } ep; - uint32_t key_type; - netobj pkey; -}; -typedef struct nis_server nis_server; - -struct directory_obj { - nis_name do_name; - nstype do_type; - struct { - u_int do_servers_len; - nis_server *do_servers_val; - } do_servers; - uint32_t do_ttl; - struct { - u_int do_armask_len; - oar_mask *do_armask_val; - } do_armask; -}; -typedef struct directory_obj directory_obj; - -#define EN_BINARY 1 -#define EN_CRYPT 2 -#define EN_XDR 4 -#define EN_MODIFIED 8 -#define EN_ASN1 64 - -struct entry_col { - uint32_t ec_flags; - struct { - u_int ec_value_len; - char *ec_value_val; - } ec_value; -}; -typedef struct entry_col entry_col; - -struct entry_obj { - char *en_type; - struct { - u_int en_cols_len; - entry_col *en_cols_val; - } en_cols; -}; -typedef struct entry_obj entry_obj; - -struct group_obj { - uint32_t gr_flags; - struct { - u_int gr_members_len; - nis_name *gr_members_val; - } gr_members; -}; -typedef struct group_obj group_obj; - -struct link_obj { - zotypes li_rtype; - struct { - u_int li_attrs_len; - nis_attr *li_attrs_val; - } li_attrs; - nis_name li_name; -}; -typedef struct link_obj link_obj; - -#define TA_BINARY 1 -#define TA_CRYPT 2 -#define TA_XDR 4 -#define TA_SEARCHABLE 8 -#define TA_CASE 16 -#define TA_MODIFIED 32 -#define TA_ASN1 64 - -struct table_col { - char *tc_name; - uint32_t tc_flags; - uint32_t tc_rights; -}; -typedef struct table_col table_col; - -struct table_obj { - char *ta_type; - int ta_maxcol; - u_char ta_sep; - struct { - u_int ta_cols_len; - table_col *ta_cols_val; - } ta_cols; - char *ta_path; -}; -typedef struct table_obj table_obj; - -struct objdata { - zotypes zo_type; - union { - struct directory_obj di_data; - struct group_obj gr_data; - struct table_obj ta_data; - struct entry_obj en_data; - struct link_obj li_data; - struct { - u_int po_data_len; - char *po_data_val; - } po_data; - } objdata_u; -}; -typedef struct objdata objdata; - -struct nis_oid { - uint32_t ctime; - uint32_t mtime; -}; -typedef struct nis_oid nis_oid; - -struct nis_object { - nis_oid zo_oid; - nis_name zo_name; - nis_name zo_owner; - nis_name zo_group; - nis_name zo_domain; - uint32_t zo_access; - uint32_t zo_ttl; - objdata zo_data; -}; -typedef struct nis_object nis_object; - -#endif /* if __nis_object_h */ - -enum nis_error { - NIS_SUCCESS = 0, - NIS_S_SUCCESS = 1, - NIS_NOTFOUND = 2, - NIS_S_NOTFOUND = 3, - NIS_CACHEEXPIRED = 4, - NIS_NAMEUNREACHABLE = 5, - NIS_UNKNOWNOBJ = 6, - NIS_TRYAGAIN = 7, - NIS_SYSTEMERROR = 8, - NIS_CHAINBROKEN = 9, - NIS_PERMISSION = 10, - NIS_NOTOWNER = 11, - NIS_NOT_ME = 12, - NIS_NOMEMORY = 13, - NIS_NAMEEXISTS = 14, - NIS_NOTMASTER = 15, - NIS_INVALIDOBJ = 16, - NIS_BADNAME = 17, - NIS_NOCALLBACK = 18, - NIS_CBRESULTS = 19, - NIS_NOSUCHNAME = 20, - NIS_NOTUNIQUE = 21, - NIS_IBMODERROR = 22, - NIS_NOSUCHTABLE = 23, - NIS_TYPEMISMATCH = 24, - NIS_LINKNAMEERROR = 25, - NIS_PARTIAL = 26, - NIS_TOOMANYATTRS = 27, - NIS_RPCERROR = 28, - NIS_BADATTRIBUTE = 29, - NIS_NOTSEARCHABLE = 30, - NIS_CBERROR = 31, - NIS_FOREIGNNS = 32, - NIS_BADOBJECT = 33, - NIS_NOTSAMEOBJ = 34, - NIS_MODFAIL = 35, - NIS_BADREQUEST = 36, - NIS_NOTEMPTY = 37, - NIS_COLDSTART_ERR = 38, - NIS_RESYNC = 39, - NIS_FAIL = 40, - NIS_UNAVAIL = 41, - NIS_RES2BIG = 42, - NIS_SRVAUTH = 43, - NIS_CLNTAUTH = 44, - NIS_NOFILESPACE = 45, - NIS_NOPROC = 46, - NIS_DUMPLATER = 47, -}; -typedef enum nis_error nis_error; - -struct nis_result { - nis_error status; - struct { - u_int objects_len; - nis_object *objects_val; - } objects; - netobj cookie; - uint32_t zticks; - uint32_t dticks; - uint32_t aticks; - uint32_t cticks; -}; -typedef struct nis_result nis_result; - -struct ns_request { - nis_name ns_name; - struct { - u_int ns_object_len; - nis_object *ns_object_val; - } ns_object; -}; -typedef struct ns_request ns_request; - -struct ib_request { - nis_name ibr_name; - struct { - u_int ibr_srch_len; - nis_attr *ibr_srch_val; - } ibr_srch; - uint32_t ibr_flags; - struct { - u_int ibr_obj_len; - nis_object *ibr_obj_val; - } ibr_obj; - struct { - u_int ibr_cbhost_len; - nis_server *ibr_cbhost_val; - } ibr_cbhost; - u_int ibr_bufsize; - netobj ibr_cookie; -}; -typedef struct ib_request ib_request; - -struct ping_args { - nis_name dir; - uint32_t stamp; -}; -typedef struct ping_args ping_args; - -enum log_entry_t { - LOG_NOP = 0, - ADD_NAME = 1, - REM_NAME = 2, - MOD_NAME_OLD = 3, - MOD_NAME_NEW = 4, - ADD_IBASE = 5, - REM_IBASE = 6, - MOD_IBASE = 7, - UPD_STAMP = 8, -}; -typedef enum log_entry_t log_entry_t; - -struct log_entry { - uint32_t le_time; - log_entry_t le_type; - nis_name le_princp; - nis_name le_name; - struct { - u_int le_attrs_len; - nis_attr *le_attrs_val; - } le_attrs; - nis_object le_object; -}; -typedef struct log_entry log_entry; - -struct log_result { - nis_error lr_status; - netobj lr_cookie; - struct { - u_int lr_entries_len; - log_entry *lr_entries_val; - } lr_entries; -}; -typedef struct log_result log_result; - -struct cp_result { - nis_error cp_status; - uint32_t cp_zticks; - uint32_t cp_dticks; -}; -typedef struct cp_result cp_result; - -struct nis_tag { - uint32_t tag_type; - char *tag_val; -}; -typedef struct nis_tag nis_tag; - -struct nis_taglist { - struct { - u_int tags_len; - nis_tag *tags_val; - } tags; -}; -typedef struct nis_taglist nis_taglist; - -struct dump_args { - nis_name da_dir; - uint32_t da_time; - struct { - u_int da_cbhost_len; - nis_server *da_cbhost_val; - } da_cbhost; -}; -typedef struct dump_args dump_args; - -struct fd_args { - nis_name dir_name; - nis_name requester; -}; -typedef struct fd_args fd_args; - -struct fd_result { - nis_error status; - nis_name source; - struct { - u_int dir_data_len; - char *dir_data_val; - } dir_data; - struct { - u_int signature_len; - char *signature_val; - } signature; -}; -typedef struct fd_result fd_result; - -/* Generic client creating flags */ -#define ZMH_VC 1 -#define ZMH_DG 2 -#define ZMH_AUTH 4 - -/* Testing Access rights for objects */ - -#define NIS_READ_ACC 1 -#define NIS_MODIFY_ACC 2 -#define NIS_CREATE_ACC 4 -#define NIS_DESTROY_ACC 8 -/* Test macros. a == access rights, m == desired rights. */ -#define NIS_WORLD(a, m) (((a) & (m)) != 0) -#define NIS_GROUP(a, m) (((a) & ((m) << 8)) != 0) -#define NIS_OWNER(a, m) (((a) & ((m) << 16)) != 0) -#define NIS_NOBODY(a, m) (((a) & ((m) << 24)) != 0) -/* - * EOL Alert - The following non-prefixed test macros are - * here for backward compatability, and will be not be present - * in future releases - use the NIS_*() macros above. - */ -#define WORLD(a, m) (((a) & (m)) != 0) -#define GROUP(a, m) (((a) & ((m) << 8)) != 0) -#define OWNER(a, m) (((a) & ((m) << 16)) != 0) -#define NOBODY(a, m) (((a) & ((m) << 24)) != 0) - -#define OATYPE(d, n) (((d)->do_armask.do_armask_val+n)->oa_otype) -#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights) -#define WORLD_DEFAULT (NIS_READ_ACC) -#define GROUP_DEFAULT (NIS_READ_ACC << 8) -#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC +\ - NIS_DESTROY_ACC) << 16) -#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT) - -/* Result manipulation defines ... */ -#define NIS_RES_NUMOBJ(x) ((x)->objects.objects_len) -#define NIS_RES_OBJECT(x) ((x)->objects.objects_val) -#define NIS_RES_COOKIE(x) ((x)->cookie) -#define NIS_RES_STATUS(x) ((x)->status) - -/* These defines make getting at the variant part of the object easier. */ -#define TA_data zo_data.objdata_u.ta_data -#define EN_data zo_data.objdata_u.en_data -#define DI_data zo_data.objdata_u.di_data -#define LI_data zo_data.objdata_u.li_data -#define GR_data zo_data.objdata_u.gr_data - -#define __type_of(o) ((o)->zo_data.zo_type) - -/* Declarations for the internal subroutines in nislib.c */ -enum name_pos {SAME_NAME, HIGHER_NAME, LOWER_NAME, NOT_SEQUENTIAL, BAD_NAME}; -typedef enum name_pos name_pos; - -/* - * Defines for getting at column data in entry objects. Because RPCGEN - * generates some rather wordy structures, we create some defines that - * collapse the needed keystrokes to access a particular value using - * these definitions they take an nis_object *, and an int and return - * a u_char * for Value, and an int for length. - */ -#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val -#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len - - -/* Prototypes, and extern declarations for the NIS library functions. */ -//#include -#endif - -/* - * nis_3.h - * - * This file contains definitions that are only of interest to the actual - * service daemon and client stubs. Normal users of NIS will not include - * this file. - * - * NOTE : This include file is automatically created by a combination - * of rpcgen and sed. DO NOT EDIT IT, change the nis.x file instead - * and then remake this file. - */ -#ifndef __nis_3_h -#define __nis_3_h - -#define NIS_PROG 100300 -#define NIS_VERSION 3 - - -__END_DECLS - -#endif /* ! _RPCSVC_NIS_H */ -- cgit v1.2.3 From 5c86f55307beee498cfe5c79678fe492a90e7a1a Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 1 Jul 2010 14:48:52 +0000 Subject: main/rpcbind: moved from testing --- testing/rpcbind/0001-uclibc-nss.patch | 28 ------------ testing/rpcbind/0002-uclibc-rpcsvc-defines.patch | 58 ------------------------ testing/rpcbind/APKBUILD | 42 ----------------- testing/rpcbind/rpcbind.confd | 4 -- testing/rpcbind/rpcbind.initd | 25 ---------- 5 files changed, 157 deletions(-) delete mode 100644 testing/rpcbind/0001-uclibc-nss.patch delete mode 100644 testing/rpcbind/0002-uclibc-rpcsvc-defines.patch delete mode 100644 testing/rpcbind/APKBUILD delete mode 100644 testing/rpcbind/rpcbind.confd delete mode 100644 testing/rpcbind/rpcbind.initd (limited to 'testing') diff --git a/testing/rpcbind/0001-uclibc-nss.patch b/testing/rpcbind/0001-uclibc-nss.patch deleted file mode 100644 index 3685c03b66..0000000000 --- a/testing/rpcbind/0001-uclibc-nss.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b8f0d7b7318ba344c25785d6f5cf3f8de98012d4 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Tue, 2 Feb 2010 09:36:03 +0000 -Subject: [PATCH 1/2] uclibc-nss - ---- - src/rpcbind.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/rpcbind.c b/src/rpcbind.c -index 525ffba..1fe1a60 100644 ---- a/src/rpcbind.c -+++ b/src/rpcbind.c -@@ -67,7 +67,11 @@ - #include - #include - #include -+#if defined(__UCLIBC__) -+#define __nss_configure_lookup(x,y) -+#else - #include -+#endif - #include "config.h" - #include "rpcbind.h" - --- -1.6.6.1 - diff --git a/testing/rpcbind/0002-uclibc-rpcsvc-defines.patch b/testing/rpcbind/0002-uclibc-rpcsvc-defines.patch deleted file mode 100644 index e394966f5c..0000000000 --- a/testing/rpcbind/0002-uclibc-rpcsvc-defines.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 077add040c2e30d3ac507362f4afe350f47be027 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Tue, 2 Feb 2010 09:47:57 +0000 -Subject: [PATCH 2/2] uclibc-rpcsvc-defines - ---- - src/security.c | 28 ++++++++++++++++++++++++++++ - 1 files changed, 28 insertions(+), 0 deletions(-) - -diff --git a/src/security.c b/src/security.c -index 0edeac6..e9fed55 100644 ---- a/src/security.c -+++ b/src/security.c -@@ -20,6 +20,32 @@ - /* - * XXX for special case checks in check_callit. - */ -+#if defined(__UCLIBC__) -+ -+#define MOUNTPROC_MNT 1 -+#define MOUNTPROC_UMNT 3 -+ -+#define NFS_PROGRAM 100003 -+#define YPPROG 100004 -+#define MOUNTPROG 100005 -+#define YPBINDPROG 100007 -+#define YPPASSWDPROG 100009 -+#define RQUOTAPROG 100011 -+ -+#define YPPROC_NULL 0 -+#define YPPROC_DOMAIN 1 -+#define YPPROC_DOMAIN_NONACK 2 -+#define YPPROC_MATCH 3 -+#define YPPROC_FIRST 4 -+#define YPPROC_NEXT 5 -+#define YPPROC_XFR 6 -+#define YPPROC_CLEAR 7 -+#define YPPROC_ALL 8 -+ -+#define YPBINDPROC_SETDOM 2 -+ -+#else -+ - #include - #include - #include -@@ -27,6 +53,8 @@ - #include - #include - -+#endif -+ - #include "rpcbind.h" - - #ifdef LIBWRAP --- -1.6.6.1 - diff --git a/testing/rpcbind/APKBUILD b/testing/rpcbind/APKBUILD deleted file mode 100644 index 3574ffece0..0000000000 --- a/testing/rpcbind/APKBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=rpcbind -pkgver=0.2.0 -pkgrel=0 -pkgdesc="portmap replacement which supports RPC over various protocols" -url="http://rpcbind.sourceforge.net" -license="custom" -depends= -makedepends="libtirpc-dev" -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - 0001-uclibc-nss.patch - 0002-uclibc-rpcsvc-defines.patch - rpcbind.initd - rpcbind.confd" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" - for i in "$srcdir"/*.patch; do - patch -p1 -i "$i" || return 1 - done -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr --bindir=/sbin - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - install -Dm755 "$srcdir"/rpcbind.initd "$pkgdir"/etc/init.d/rpcbind - install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind - install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING -} -md5sums="1a77ddb1aaea8099ab19c351eeb26316 rpcbind-0.2.0.tar.bz2 -6d9718d8bdab633ef7cf83225aaed367 0001-uclibc-nss.patch -944234c5ef6902d25bd6dfc95f979ed6 0002-uclibc-rpcsvc-defines.patch -381a2722c69b4597af532381f1ffeae0 rpcbind.initd -1ad5c8dcf432c8f23ba740f4c32a7c60 rpcbind.confd" diff --git a/testing/rpcbind/rpcbind.confd b/testing/rpcbind/rpcbind.confd deleted file mode 100644 index ddc09172d1..0000000000 --- a/testing/rpcbind/rpcbind.confd +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/conf.d/rpcbind - -# Options for `rpcbind`. -#RPCBIND_OPTS="-l" diff --git a/testing/rpcbind/rpcbind.initd b/testing/rpcbind/rpcbind.initd deleted file mode 100644 index 897e8e5a88..0000000000 --- a/testing/rpcbind/rpcbind.initd +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/files/rpcbind.initd,v 1.1 2007/12/29 09:13:55 vapier Exp $ - -depend() { - use net - before inetd xinetd - after firewall - provide portmap -} - -start() { - ebegin "Starting rpcbind" - start-stop-daemon --start --quiet --exec /sbin/rpcbind \ - -- ${RPCBIND_OPTS} - eend $? -} - -stop() { - ebegin "Stopping rpcbind" - start-stop-daemon --stop --quiet --exec /sbin/rpcbind - eend $? -} - -- cgit v1.2.3 From 6caab54a5dfdc8ad5df42147ee3587eaafc8cf9b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 6 Jul 2010 07:55:23 +0000 Subject: testing/ircii: set default server to irc.freenode.net --- testing/ircii/APKBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/ircii/APKBUILD b/testing/ircii/APKBUILD index 1c16d509aa..8b1f38e1c9 100644 --- a/testing/ircii/APKBUILD +++ b/testing/ircii/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason pkgname=ircii pkgver=20080314 -pkgrel=1 +pkgrel=2 pkgdesc="Universal IRC for Unix systems" url="http://www.eterna.com.au/ircii/" license="GPL" @@ -14,11 +14,12 @@ source="ftp://ircii.warped.com/pub/ircII/ircii-20080314.tar.bz2" build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info + --infodir=/usr/share/info \ + --with-default-server=irc.freenode.net \ + || return 1 make || return 1 } -- cgit v1.2.3 From e105360f5eb1856799fcf8be9fee5fa4cccf5ce3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 6 Jul 2010 07:57:07 +0000 Subject: main/ircii: move from testing --- testing/ircii/APKBUILD | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 testing/ircii/APKBUILD (limited to 'testing') diff --git a/testing/ircii/APKBUILD b/testing/ircii/APKBUILD deleted file mode 100644 index 8b1f38e1c9..0000000000 --- a/testing/ircii/APKBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Contributor: Michael Mason -# Maintainer: Michael Mason -pkgname=ircii -pkgver=20080314 -pkgrel=2 -pkgdesc="Universal IRC for Unix systems" -url="http://www.eterna.com.au/ircii/" -license="GPL" -depends= -makedepends= -install= -subpackages="$pkgname-doc $pkgname-dev" -source="ftp://ircii.warped.com/pub/ircII/ircii-20080314.tar.bz2" - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-default-server=irc.freenode.net \ - || return 1 - make || return 1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 DESTDIR="$pkgdir" install -} - -md5sums="da7fcf2a442bd25f303778eb6466eb19 ircii-20080314.tar.bz2" -- cgit v1.2.3 From 16164ba035609a2a8f7f98de7fa1052ad201a915 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 6 Jul 2010 12:27:16 +0000 Subject: testing/mdocml: new aport Roff implementation http://mdocml.bsd.lv/ alot smaller than groff but we still seem to need /usr/bin/tbl --- testing/mdocml/APKBUILD | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 testing/mdocml/APKBUILD (limited to 'testing') diff --git a/testing/mdocml/APKBUILD b/testing/mdocml/APKBUILD new file mode 100644 index 0000000000..7fd6fd32af --- /dev/null +++ b/testing/mdocml/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: +# Maintainer: +pkgname=mdocml +pkgver=1.10.2 +pkgrel=0 +pkgdesc="Roff implementation" +url="http://mdocml.bsd.lv/" +license="BSD" +depends= +makedepends= +install= +subpackages="$pkgname-doc" +source="http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + sed -i -e 's:/usr/local:/usr:' Makefile || return 1 +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" MANDIR=/usr/share/man \ + EXAMPLEDIR=/usr/share/doc/mdocml/examples install +} + +md5sums="aa52d80c5ccbd2d6d434c63c2435a060 mdocml-1.10.2.tar.gz" -- cgit v1.2.3 From 37a97cda850a8ac1738db7887cefb15d4cc39cc5 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 6 Jul 2010 13:06:21 +0000 Subject: testing/tbl: new aport Utility to format tables for troff http://tbl.bsd.lv/ --- testing/tbl/APKBUILD | 39 +++++++++++++++++++++++++++++++++++++++ testing/tbl/tbl-install.patch | 19 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 testing/tbl/APKBUILD create mode 100644 testing/tbl/tbl-install.patch (limited to 'testing') diff --git a/testing/tbl/APKBUILD b/testing/tbl/APKBUILD new file mode 100644 index 0000000000..de2286ea68 --- /dev/null +++ b/testing/tbl/APKBUILD @@ -0,0 +1,39 @@ +# Maintainer: Natanael Copa +pkgname=tbl +pkgver=0.1.5 +pkgrel=0 +pkgdesc="Utility to format tables for troff" +url="http://tbl.bsd.lv/" +license="ISC" +depends= +makedepends= +install= +subpackages="$pkgname-doc" +source="http://tbl.bsd.lv/snapshots/tbl-$pkgver.tar.gz + tbl-install.patch" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) + patch -p1 -i "$srcdir"/$i || return 1 + ;; + esac + done +} + +build() { + cd "$_builddir" + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" PREFIX=/usr MANDIR=/usr/share/man install +} + +md5sums="633edde9037b0a01b045b05e655ee7c9 tbl-0.1.5.tar.gz +e4f29245b659de9814ff1a7a1c98ffb2 tbl-install.patch" diff --git a/testing/tbl/tbl-install.patch b/testing/tbl/tbl-install.patch new file mode 100644 index 0000000000..72465ea2d8 --- /dev/null +++ b/testing/tbl/tbl-install.patch @@ -0,0 +1,19 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -64,11 +64,11 @@ + install -m 0444 tbl-$(VERSION).md5 $(PREFIX)/snapshots/tbl.md5 + + install: +- mkdir -p $(BINDIR) +- mkdir -p $(MANDIR)/man5 +- $(INSTALL_PROGRAM) tbl $(BINDIR) +- $(INSTALL_MAN) tbl.5 $(MANDIR)/man5 +- $(INSTALL_MAN) tbl.1 $(MANDIR)/man1 ++ mkdir -p $(DESTDIR)$(BINDIR) ++ mkdir -p $(DESTDIR)$(MANDIR)/man5 ++ $(INSTALL_PROGRAM) tbl $(DESTDIR)$(BINDIR) ++ $(INSTALL_MAN) tbl.5 $(DESTDIR)$(MANDIR)/man5 ++ $(INSTALL_MAN) tbl.1 $(DESTDIR)$(MANDIR)/man1 + + main.o: main.c tbl.h + -- cgit v1.2.3 From 28f5ebf2fb5a6e97186c4d7435e1ba16fb928a14 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 6 Jul 2010 15:13:10 +0000 Subject: testing/kamailio: add mysql and pcre support --- testing/kamailio/APKBUILD | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'testing') diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index db7af6dac5..ba63dfe0dc 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD @@ -2,18 +2,18 @@ # Maintainer: Natanael Copa pkgname=kamailio pkgver=3.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source SIP Server" url="http://www.kamailio.org/" pkgusers="kamailio" pkggroups="kamailio" license="GPL" depends= -makedepends="bison flex expat-dev postgresql-dev pcre-dev +makedepends="bison flex expat-dev postgresql-dev pcre-dev mysql-dev libxml2-dev curl-dev unixodbc-dev confuse-dev" install= -subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence - $pkgname-mediaproxy $pkgname-unixodbc" +subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence $pkgname-pcre + $pkgname-mediaproxy $pkgname-unixodbc $pkgname-mysql" source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz kamailio.cfg kamailio.initd @@ -23,10 +23,17 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src. " _builddir="$srcdir"/$pkgname-$pkgver -# Makefile does not handle newline -_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo" -_modules="db_postgres mediaproxy db_unixodbc carrierroute xmlrpc tm $_presence" + +_default="carrierroute xmlrpc tm" +_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo" +_pcre="dialplan lcr regex" +_postgres="db_postgres" +_mysql="db_mysql" +_mediaproxy="mediaproxy" +_odbc="db_unixodbc" +# Makefile does not handle newline +_modules="$_default $_postgres $_mediaproxy $_odbc $_presence $_mysql $_pcre" prepare() { @@ -56,7 +63,7 @@ prepare() { build() { cd "$_builddir" - make LOCALBASE=/usr \ + make LOCALBASE=/usr \ cfg_target=/etc/kamailio/ \ MODS_MYSQL=yes \ MODS_PCRE=yes \ @@ -127,7 +134,8 @@ postgres() { pcre() { pkgdesc="Regular expressions support for kamailio" - _mv_mod dialplan lcr regex + _mv_mod dialplan lcr + _mv_mod_k regex } presence() { @@ -138,13 +146,13 @@ presence() { mediaproxy() { pkgdesc="Mediaproxy support for kamailio" depends="kamailio" - _mv_mod mediaproxy + _mv_mod $_mediaproxy } unixodbc() { pkgdesc="UnixODBC support for kamailio" depends="kamailio" - _mv_mod_k db_unixodbc + _mv_mod_k $_odbc } md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz -- cgit v1.2.3 From 8d59a683e1c4b3992236914ca7f604d1ab54cac9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 09:48:06 +0000 Subject: testing/kamailio: build fix try work around paralell build issue? --- testing/kamailio/APKBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD index ba63dfe0dc..fe066f4663 100644 --- a/testing/kamailio/APKBUILD +++ b/testing/kamailio/APKBUILD @@ -63,7 +63,11 @@ prepare() { build() { cd "$_builddir" - make LOCALBASE=/usr \ + + # workaround parallel build issue + make -C lib/kcore strcommon.o || return 1 + + make LOCALBASE=/usr \ cfg_target=/etc/kamailio/ \ MODS_MYSQL=yes \ MODS_PCRE=yes \ -- cgit v1.2.3 From fa63d0c8c020a294406515aa3c03826e4a3034a1 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 12:51:44 +0000 Subject: testing/mc: new aport A filemanager/shell that emulates Norton Commander http://www.ibiblio.org/mc/ fixes #374 --- testing/mc/APKBUILD | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 testing/mc/APKBUILD (limited to 'testing') diff --git a/testing/mc/APKBUILD b/testing/mc/APKBUILD new file mode 100644 index 0000000000..72d59ce281 --- /dev/null +++ b/testing/mc/APKBUILD @@ -0,0 +1,42 @@ +# Maintainer: Natanael Copa +pkgname=mc +pkgver=4.7.0.7 +pkgrel=0 +pkgdesc="A filemanager/shell that emulates Norton Commander" +url="http://www.ibiblio.org/mc/" +license="GPL" +depends="" +makedepends="e2fsprogs-dev glib-dev pcre-dev slang-dev" +source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --enable-background \ + --enable-charset \ + --enable-largefile \ + --with-edit \ + --with-mmap \ + --with-screen=slang \ + --with-subshell \ + --with-vfs \ + --without-debug \ + --without-gnome \ + --without-gpm-mouse \ + --without-included-gettext \ + --without-samba \ + --without-x \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="23e35ad8917fc752dffedb06b5d0bf98 mc-4.7.0.7.tar.bz2" -- cgit v1.2.3 From 3a59681f21a5870c3f26060ece2794817ce3e81e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 13:02:14 +0000 Subject: main/kamailio: upgrade to 3 (moved from testing) --- testing/kamailio/APKBUILD | 167 ---------------------------- testing/kamailio/kamailio-3-backslash.patch | 36 ------ testing/kamailio/kamailio.cfg | 107 ------------------ testing/kamailio/kamailio.initd | 26 ----- testing/kamailio/kamailio.post-install | 5 - testing/kamailio/kamailio.pre-install | 5 - 6 files changed, 346 deletions(-) delete mode 100644 testing/kamailio/APKBUILD delete mode 100644 testing/kamailio/kamailio-3-backslash.patch delete mode 100644 testing/kamailio/kamailio.cfg delete mode 100644 testing/kamailio/kamailio.initd delete mode 100644 testing/kamailio/kamailio.post-install delete mode 100644 testing/kamailio/kamailio.pre-install (limited to 'testing') diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD deleted file mode 100644 index fe066f4663..0000000000 --- a/testing/kamailio/APKBUILD +++ /dev/null @@ -1,167 +0,0 @@ -# Contributor: Michael Mason -# Maintainer: Natanael Copa -pkgname=kamailio -pkgver=3.0.2 -pkgrel=4 -pkgdesc="Open Source SIP Server" -url="http://www.kamailio.org/" -pkgusers="kamailio" -pkggroups="kamailio" -license="GPL" -depends= -makedepends="bison flex expat-dev postgresql-dev pcre-dev mysql-dev - libxml2-dev curl-dev unixodbc-dev confuse-dev" -install= -subpackages="$pkgname-doc $pkgname-postgres $pkgname-presence $pkgname-pcre - $pkgname-mediaproxy $pkgname-unixodbc $pkgname-mysql" -source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz - kamailio.cfg - kamailio.initd - kamailio.pre-install - kamailio.post-install - kamailio-3-backslash.patch - " - -_builddir="$srcdir"/$pkgname-$pkgver - - -_default="carrierroute xmlrpc tm" -_presence="presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp rls xcap_client presence_dialoginfo pua_dialoginfo" -_pcre="dialplan lcr regex" -_postgres="db_postgres" -_mysql="db_mysql" -_mediaproxy="mediaproxy" -_odbc="db_unixodbc" -# Makefile does not handle newline -_modules="$_default $_postgres $_mediaproxy $_odbc $_presence $_mysql $_pcre" - - -prepare() { - cd "$_builddir" - patch -p1 -i "$srcdir"/kamailio-3-backslash.patch || return 1 - - sed -i \ - -e "s:-O9 -funroll-loops:$CFLAGS:g" \ - Makefile.defs \ - || return 1 - -# -e 's:^cfg-target.*:cfg-target = $(cfg-dir):' \ -# -e 's:^cfg-prefix.*:cfg-prefix = $(basedir):' \ - - cd utils/kamctl/ - sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \ - kamctl.base kamctlrc || return 1 - # we actually dont need bash - sed -i -e 's:/bin/bash:/bin/sh:' kamctl kamdbctl \ - || return 1 - # Set email_address field as not required field (could be null) - cd dbtext/kamailio - sed -i -e 's:email_address(string):email_address(string,null):' subscriber \ - || return 1 - -} - -build() { - cd "$_builddir" - - # workaround parallel build issue - make -C lib/kcore strcommon.o || return 1 - - make LOCALBASE=/usr \ - cfg_target=/etc/kamailio/ \ - MODS_MYSQL=yes \ - MODS_PCRE=yes \ - MODS_RADIUS= \ - TLS= \ - include_modules="$_modules" \ - all || return 1 -} - -package() { - cd "$_builddir" - make LOCALBASE=/usr \ - cfg_target=/etc/kamailio/ \ - MODS_MYSQL=yes \ - MODS_PCRE=yes \ - MODS_RADIUS= \ - TLS= \ - include_modules="$_modules" \ - basedir="$pkgdir" \ - cfg_prefix="$pkgdir" \ - install || return 1 - - # move default config to -doc package and use our own default config - - mv "$pkgdir"/etc/kamailio/kamailio.cfg \ - "$pkgdir"/usr/share/doc/kamailio/ - install -m644 -D "$srcdir"/kamailio.cfg \ - "$pkgdir"/etc/kamailio/kamailio.cfg - - install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - install -d -o kamailio "$pkgdir"/var/run/kamailio -} - -_mv_mod() { - local moddir=usr/lib/kamailio/modules i= - mkdir -p "$subpkgdir"/$moddir - for i in $@; do - mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1 - done -} - -_mv_mod_k() { - local moddir=usr/lib/kamailio/modules_k i= - mkdir -p "$subpkgdir"/$moddir - for i in $@; do - mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/ || return 1 - done -} - - -mysql() { - pkgdesc="MySQL support for kamailio" - depends="kamailio mysql-client" - _mv_mod db_mysql - mkdir -p "$subpkgdir"/usr/share/kamailio - mv "$pkgdir"/usr/share/kamailio/mysql \ - "$subpkgdir"/usr/share/kamailio/ -} - -postgres() { - pkgdesc="PostgreSQL support for kamailio" - depends="kamailio postgresql-client" - _mv_mod db_postgres - mkdir -p "$subpkgdir"/usr/share/kamailio - mv "$pkgdir"/usr/share/kamailio/postgres \ - "$subpkgdir"/usr/share/kamailio/ -} - -pcre() { - pkgdesc="Regular expressions support for kamailio" - _mv_mod dialplan lcr - _mv_mod_k regex -} - -presence() { - pkgdesc="Presence support for kamailio" - _mv_mod_k $_presence -} - -mediaproxy() { - pkgdesc="Mediaproxy support for kamailio" - depends="kamailio" - _mv_mod $_mediaproxy -} - -unixodbc() { - pkgdesc="UnixODBC support for kamailio" - depends="kamailio" - _mv_mod_k $_odbc -} - -md5sums="dd039e078a77032a423fb15f9685ad31 kamailio-3.0.2_src.tar.gz -a3c959ec568c43a905710e7d25cd8c25 kamailio.cfg -81100c479890a2a8c2628db22fdd1a0c kamailio.initd -c646af2dd31f5c4289a2f802c873d98f kamailio.pre-install -3fbaf633ff1620d0d526fc4047c7bed9 kamailio.post-install -36f81be3a082a81497e261ac8e6c5414 kamailio-3-backslash.patch" diff --git a/testing/kamailio/kamailio-3-backslash.patch b/testing/kamailio/kamailio-3-backslash.patch deleted file mode 100644 index f132aebab4..0000000000 --- a/testing/kamailio/kamailio-3-backslash.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/scripts/kamdbctl.base b/scripts/kamdbctl.base -index 83f5a8a..5b640be 100644 ---- a/utils/kamctl/kamdbctl.base -+++ b/utils/kamctl/kamdbctl.base -@@ -32,13 +32,13 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESENCE_TABLES:-ask} - - # Used by dbtext and db_berkeley to define tables to be created, used by - # postgres to do the grants --STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases lcr domain grp -- uri speed_dial gw pdt subscriber location re_grp trusted -- address missed_calls usr_preferences aliases silo dialog -+STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases lcr domain grp \ -+ uri speed_dial gw pdt subscriber location re_grp trusted \ -+ address missed_calls usr_preferences aliases silo dialog \ - dispatcher dialplan} --EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute -+EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute \ - carrier_name domain_name carrierfailureroute userblacklist globalblacklist htable purplemap} --PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap -+PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \ - pua rls_presentity rls_watchers} - - # SQL definitions -@@ -61,9 +61,9 @@ GREP=${GREP:-grep} - SED=${SED:-sed} - - # define what modules should be installed --STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions -- registrar usrloc msilo alias_db uri_db -- speeddial avpops auth_db pdt dialog dispatcher -+STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions \ -+ registrar usrloc msilo alias_db uri_db \ -+ speeddial avpops auth_db pdt dialog dispatcher \ - dialplan} - EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute userblacklist htable purple} - diff --git a/testing/kamailio/kamailio.cfg b/testing/kamailio/kamailio.cfg deleted file mode 100644 index 1558cce9ca..0000000000 --- a/testing/kamailio/kamailio.cfg +++ /dev/null @@ -1,107 +0,0 @@ -# Sample Kamailio Configuration -# 23 June 2010 - For Alpine Linux -# Accepts all registrations; routes calls to any registered AOR - -#-------------------------------------------------------- -# Section 1: Global Definitions -#-------------------------------------------------------- -debug = 2 -fork = yes -log_stderror = no -# listen = 0.0.0.0 -port = 5060 -children = 4 - -dns = no -rev_dns = no - -mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" - -#-------------------------------------------------------- -# Section 2: Modules -#-------------------------------------------------------- - -loadmodule "tm.so" -loadmodule "sl.so" -loadmodule "tmx.so" -loadmodule "rr.so" -loadmodule "maxfwd.so" -loadmodule "usrloc.so" -loadmodule "registrar.so" -loadmodule "mi_fifo.so" -loadmodule "pv.so" -loadmodule "xlog.so" - -#-------------------------------------------------------- -# Section 3: Module Configuration -#-------------------------------------------------------- - -modparam ( "usrloc", "db_mode", 0 ) -modparam ( "rr", "enable_full_lr", 1 ) -modparam ( "mi_fifo", "fifo_name", "/tmp/kamailio_fifo") - -#-------------------------------------------------------- -# Section 4: Main Route Block -#-------------------------------------------------------- - -route - { - # Uncomment next line if you want to see - # each incoming message - xlog( "L_INFO", "$rm: $fu -> $ru" ); - - if (!mf_process_maxfwd_header("10")) - { - sl_send_reply("483", "Too Many Hops"); - return; - } - - if (msg:len > 4096) - { - sl_send_reply("513", "Message too big" ); - return; - } - - if (method == "REGISTER" ) - { - route(REGISTER); - return; - } - - loose_route(); - - if (!lookup("location")) { - sl_send_reply("404", "User Not Found"); - return; - } - - route(RELAY); - -} -#-------------------------------------------------------- -# Section 5: Secondary Route Blocks -#-------------------------------------------------------- - -# - Default message handler -route[RELAY] { - if (!t_relay()) { - sl_reply_error(); - } -} - -#- Registration Request -route[REGISTER] { - if (!save("location")) { - sl_reply_error(); - } -} - -#-------------------------------------------------------- -# Section 6: Reply Route Block -#-------------------------------------------------------- - - -#-------------------------------------------------------- -# Section 7: Failure Route Block -#-------------------------------------------------------- - diff --git a/testing/kamailio/kamailio.initd b/testing/kamailio/kamailio.initd deleted file mode 100644 index ee4e2ecef1..0000000000 --- a/testing/kamailio/kamailio.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript - -daemon=/usr/sbin/kamailio -pidfile=/var/run/kamailio/kamailio.pid - -depend() { - need net - after firewall -} - -start() { - ebegin "Starting Kamailio" - start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \ - -- \ - -u ${KAMAILIO_USER:-kamailio} \ - -g ${KAMAILIO_GROUP:-kamailio} \ - -P $pidfile \ - ${KAMAILIO_OPTS:-} - eend $? -} - -stop() { - ebegin "Stopping Kamailio" - start-stop-daemon --stop --quiet --pidfile $pidfile - eend $? -} diff --git a/testing/kamailio/kamailio.post-install b/testing/kamailio/kamailio.post-install deleted file mode 100644 index 19fc932dd6..0000000000 --- a/testing/kamailio/kamailio.post-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -chown -R kamailio:kamailio /var/run/kamailio -chgrp kamailio /etc/kamailio/kamailio.cfg -exit 0 diff --git a/testing/kamailio/kamailio.pre-install b/testing/kamailio/kamailio.pre-install deleted file mode 100644 index 78dfa38bf3..0000000000 --- a/testing/kamailio/kamailio.pre-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -adduser -H -h /var/empty -s /bin/false -D kamailio 2>/dev/null - -exit 0 -- cgit v1.2.3 From f7900a9fcc96a8cc8c3244399f46110d261a09b7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 13:27:02 +0000 Subject: testing/libcap-ng: new aport posix capabilities library http://people.redhat.com/sgrubb/libcap-ng/index.html fixes #95 --- testing/libcap-ng/APKBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 testing/libcap-ng/APKBUILD (limited to 'testing') diff --git a/testing/libcap-ng/APKBUILD b/testing/libcap-ng/APKBUILD new file mode 100644 index 0000000000..3abe2e2317 --- /dev/null +++ b/testing/libcap-ng/APKBUILD @@ -0,0 +1,41 @@ +# Maintainer: Natanael Copa +pkgname=libcap-ng +pkgver=0.6.4 +pkgrel=0 +pkgdesc="posix capabilities library" +url="http://people.redhat.com/sgrubb/libcap-ng/index.html" +license="GPL" +depends= +makedepends="python" +install= +subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" +source="http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +utils() { + pkgdesc="posix capabilities utils" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ +} + +md5sums="ae817cd585ca11db257330b392003ed6 libcap-ng-0.6.4.tar.gz" -- cgit v1.2.3 From c379adf1be8d57c4a3d0f2eeefd1d1abcfd9fc28 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 13:29:48 +0000 Subject: testing/ircservices: upgrade to 5.1.23 --- testing/ircservices/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/ircservices/APKBUILD b/testing/ircservices/APKBUILD index 57d36e7099..45908ca064 100644 --- a/testing/ircservices/APKBUILD +++ b/testing/ircservices/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=ircservices -pkgver=5.1.21 -pkgrel=1 +pkgver=5.1.23 +pkgrel=0 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)" url="http://www.ircservices.za.net/" license="GPL" @@ -74,5 +74,5 @@ package() { etc/ircservices/modules.conf } -md5sums="3db58bb1645423a23872e8d1f51a8a99 ircservices-5.1.21.tar.gz +md5sums="666351f44adf57effc310a7a5943c9a2 ircservices-5.1.23.tar.gz 279ea42c5d97b47787b5959c9981fbaa ircservices.initd" -- cgit v1.2.3 From de324753cf388f50452c5bcd7bf723ea133080b0 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 13:57:54 +0000 Subject: testing/ircservice: set proper permissions so we are allowed to start it --- testing/ircservices/APKBUILD | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/ircservices/APKBUILD b/testing/ircservices/APKBUILD index 45908ca064..46a07c3c36 100644 --- a/testing/ircservices/APKBUILD +++ b/testing/ircservices/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=ircservices pkgver=5.1.23 -pkgrel=0 +pkgrel=1 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)" url="http://www.ircservices.za.net/" license="GPL" @@ -14,6 +14,14 @@ subpackages="$pkgname-doc" source="http://www.ircservices.za.net/download/$pkgname-$pkgver.tar.gz $pkgname.initd" +prepare() { + cd "$srcdir"/$pkgname-$pkgver + sed -i \ + -e "s/-m 750/-m 755/" \ + -e "s/-m 640/-m 644/" \ + configure +} + build() { cd "$srcdir"/$pkgname-$pkgver RUNGROUP=ircservices ./configure \ -- cgit v1.2.3 From e349765e32d91566ed042a322ff89ab4b3a3e476 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 14:18:56 +0000 Subject: main/libcap-ng: moved from testing fixes #95 --- testing/libcap-ng/APKBUILD | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 testing/libcap-ng/APKBUILD (limited to 'testing') diff --git a/testing/libcap-ng/APKBUILD b/testing/libcap-ng/APKBUILD deleted file mode 100644 index 3abe2e2317..0000000000 --- a/testing/libcap-ng/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=libcap-ng -pkgver=0.6.4 -pkgrel=0 -pkgdesc="posix capabilities library" -url="http://people.redhat.com/sgrubb/libcap-ng/index.html" -license="GPL" -depends= -makedepends="python" -install= -subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" -source="http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz" - -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" - # apply patches here -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install -} - -utils() { - pkgdesc="posix capabilities utils" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ -} - -md5sums="ae817cd585ca11db257330b392003ed6 libcap-ng-0.6.4.tar.gz" -- cgit v1.2.3 From cfb49dfb2409bb61ad97e8198e9bdd7450e462eb Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 14:20:31 +0000 Subject: testing/atomic-ops: removed since its not needed anymore ref #96 --- testing/atomic-ops/APKBUILD | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 testing/atomic-ops/APKBUILD (limited to 'testing') diff --git a/testing/atomic-ops/APKBUILD b/testing/atomic-ops/APKBUILD deleted file mode 100644 index 7c9dc2cf2f..0000000000 --- a/testing/atomic-ops/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: Natanael Copa -# Maintainer: Natanael Copa -pkgname=atomic-ops -_ver=7.2 -_suff=alpha4 -pkgver=${_ver}_${_suff} -_realver=${_ver}${_suff} -pkgrel=0 -pkgdesc="A library for atomic operations" -url="http://www.hpl.hp.com/research/linux/atomic_ops/download.php4" -license="GPL" -depends="" -makedepends="" -install= -subpackages= -source="http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-$_realver.tar.gz" - -_builddir="$srcdir"/libatomic_ops-${_realver} -build() { - cd "$_builddir" - chmod +x install-sh - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install -} - -md5sums="e82723a24fd846fe37bd6a03728776e1 libatomic_ops-7.2alpha4.tar.gz" -- cgit v1.2.3 From 09465b07d6e48a64b416930c92788f54da62437f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 14:23:15 +0000 Subject: main/mc: moved from testing ref #374 --- testing/mc/APKBUILD | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 testing/mc/APKBUILD (limited to 'testing') diff --git a/testing/mc/APKBUILD b/testing/mc/APKBUILD deleted file mode 100644 index 72d59ce281..0000000000 --- a/testing/mc/APKBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=mc -pkgver=4.7.0.7 -pkgrel=0 -pkgdesc="A filemanager/shell that emulates Norton Commander" -url="http://www.ibiblio.org/mc/" -license="GPL" -depends="" -makedepends="e2fsprogs-dev glib-dev pcre-dev slang-dev" -source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --enable-background \ - --enable-charset \ - --enable-largefile \ - --with-edit \ - --with-mmap \ - --with-screen=slang \ - --with-subshell \ - --with-vfs \ - --without-debug \ - --without-gnome \ - --without-gpm-mouse \ - --without-included-gettext \ - --without-samba \ - --without-x \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 -} - -md5sums="23e35ad8917fc752dffedb06b5d0bf98 mc-4.7.0.7.tar.bz2" -- cgit v1.2.3 From da5c2bd399502ac39b7fdd942ca121eb73d54f71 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 14:40:25 +0000 Subject: main/ircservices: moved from testing fixes #189 --- testing/ircservices/APKBUILD | 86 ----------------------------- testing/ircservices/ircservices.confd | 6 -- testing/ircservices/ircservices.initd | 29 ---------- testing/ircservices/ircservices.pre-install | 5 -- 4 files changed, 126 deletions(-) delete mode 100644 testing/ircservices/APKBUILD delete mode 100644 testing/ircservices/ircservices.confd delete mode 100644 testing/ircservices/ircservices.initd delete mode 100644 testing/ircservices/ircservices.pre-install (limited to 'testing') diff --git a/testing/ircservices/APKBUILD b/testing/ircservices/APKBUILD deleted file mode 100644 index 46a07c3c36..0000000000 --- a/testing/ircservices/APKBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=ircservices -pkgver=5.1.23 -pkgrel=1 -pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)" -url="http://www.ircservices.za.net/" -license="GPL" -depends= -makedepends="perl" -install=$pkgname.pre-install -pkgusers="ircservices" -pkggroups="ircservices" -subpackages="$pkgname-doc" -source="http://www.ircservices.za.net/download/$pkgname-$pkgver.tar.gz - $pkgname.initd" - -prepare() { - cd "$srcdir"/$pkgname-$pkgver - sed -i \ - -e "s/-m 750/-m 755/" \ - -e "s/-m 640/-m 644/" \ - configure -} - -build() { - cd "$srcdir"/$pkgname-$pkgver - RUNGROUP=ircservices ./configure \ - -cc "$CC" \ - -cflags "$CFLAGS" \ - -bindest /usr/bin \ - -datdest /var/lib/ircservices \ - || return 1 - - # build targets one by one as paralell builds breaks - make config-check &&\ - make ircservices &&\ - make languages &&\ - make tools -} - -package() { - cd "$srcdir"/$pkgname-$pkgver -# export INSTALL_PREFIX="$pkgdir" - make -j1 \ - BINDEST="$pkgdir"/usr/bin \ - DATDEST="$pkgdir"/var/lib/ircservices \ - install || return 1 - - install -d "$pkgdir"/usr/share/man/man8 - install docs/ircservices.8 "$pkgdir"/usr/share/man/man8/ircservices.8 - install docs/convert-db.8 \ - "$pkgdir"/usr/share/man/man8/ircservices-convert-db.8 - - # try conform to FHS - cd "$pkgdir" - install -d etc/ircservices usr/share/ircservices var/log/ircservices - - mv var/lib/ircservices/convert-db usr/bin/ircservices-convert-db - - mv var/lib/ircservices/example-ircservices.conf \ - etc/ircservices/ircservices.conf - ln -s /etc/ircservices/ircservices.conf \ - var/lib/ircservices/ircservices.conf - - mv var/lib/ircservices/example-modules.conf \ - etc/ircservices/modules.conf - ln -s /etc/ircservices/modules.conf var/lib/ircservices/modules.conf - - mv var/lib/ircservices/languages \ - var/lib/ircservices/helpfiles \ - usr/share/ircservices/ - ln -s /usr/share/ircservices/languages var/lib/ircservices/ - ln -s /usr/share/ircservices/helpfiles var/lib/ircservices/ - - install -Dm755 "$srcdir"/ircservices.initd \ - etc/init.d/ircservices - - chown ircservices:ircservices var/lib/ircservices \ - var/log/ircservices - - chown root:ircservices etc/ircservices/ircservices.conf \ - etc/ircservices/modules.conf -} - -md5sums="666351f44adf57effc310a7a5943c9a2 ircservices-5.1.23.tar.gz -279ea42c5d97b47787b5959c9981fbaa ircservices.initd" diff --git a/testing/ircservices/ircservices.confd b/testing/ircservices/ircservices.confd deleted file mode 100644 index 31cc902d21..0000000000 --- a/testing/ircservices/ircservices.confd +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.conf.d,v 1.2 2005/05/16 15:36:11 swegener Exp $ - -# Se this to true to have ircservices depend on a local ircd to be up -LOCALIRCD="false" diff --git a/testing/ircservices/ircservices.initd b/testing/ircservices/ircservices.initd deleted file mode 100644 index 8c2a11e8ba..0000000000 --- a/testing/ircservices/ircservices.initd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.5 2006/11/05 22:23:08 swegener Exp $ - -depend() { - need net - after firewall - use ircd -} - -start() { - ebegin "Starting IRC Services" - start-stop-daemon --start --quiet --exec /usr/bin/ircservices \ - --chuid ircservices \ - -- \ - -dir=/var/lib/ircservices \ - -log=/var/log/ircservices/ircservices.log \ - &>/dev/null - eend $? -} - -stop() { - ebegin "Stopping IRC Services" - start-stop-daemon --stop --quiet \ - --pidfile /var/lib/ircservices/ircservices.pid - eend $? - rm -f /var/lib/ircservices/ircservices.pid -} diff --git a/testing/ircservices/ircservices.pre-install b/testing/ircservices/ircservices.pre-install deleted file mode 100644 index 093f888563..0000000000 --- a/testing/ircservices/ircservices.pre-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -adduser -h /var/lib/ircservices -s /bin/false -S -D ircservices 2>/dev/null -exit 0 - -- cgit v1.2.3 From 38c4ccd875603ddc883e6bdb30f8e062f3ac1734 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 7 Jul 2010 18:53:10 +0000 Subject: testing/libgee: new aport GObject collection library http://live.gnome.org/Libgee --- testing/libgee/APKBUILD | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 testing/libgee/APKBUILD (limited to 'testing') diff --git a/testing/libgee/APKBUILD b/testing/libgee/APKBUILD new file mode 100644 index 0000000000..23c52d98bf --- /dev/null +++ b/testing/libgee/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa +pkgname=libgee +pkgver=0.5.1 +pkgrel=0 +pkgdesc="GObject collection library" +url="http://live.gnome.org/Libgee" +license="LGPL2.1" +depends="" +makedepends=" glib-dev" +subpackages="$pkgname-dev" +source="http://ftp.gnome.org/pub/GNOME/sources/libgee/0.5/libgee-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="59789b5b266beadfb8b51bf2c96211b3 libgee-0.5.1.tar.bz2" -- cgit v1.2.3 From 836efa79e6397dda69543c7b553e33f5bcf2d615 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 8 Jul 2010 09:45:25 +0000 Subject: testing/open-vm-tools: new aport The Open Virtual Machine Tools are the open source implementation of VMware Tools. http://open-vm-tools.sourceforge.net/ --- testing/open-vm-tools/APKBUILD | 109 +++++++++++++ testing/open-vm-tools/checkvm-pie-safety.patch | 67 ++++++++ testing/open-vm-tools/codeset-uclibc.patch | 20 +++ testing/open-vm-tools/ecvt.patch | 205 +++++++++++++++++++++++++ testing/open-vm-tools/getloadavg-uclibc.patch | 22 +++ testing/open-vm-tools/iconv-uclibc.patch | 12 ++ testing/open-vm-tools/libm.patch | 18 +++ testing/open-vm-tools/open-vm-tools.desktop | 7 + testing/open-vm-tools/open-vm-tools.initd | 76 +++++++++ testing/open-vm-tools/open-vm.confd | 2 + testing/open-vm-tools/open-vm.initd | 76 +++++++++ testing/open-vm-tools/resume-vm-default.patch | 49 ++++++ testing/open-vm-tools/suspend-vm-default.patch | 49 ++++++ 13 files changed, 712 insertions(+) create mode 100644 testing/open-vm-tools/APKBUILD create mode 100644 testing/open-vm-tools/checkvm-pie-safety.patch create mode 100644 testing/open-vm-tools/codeset-uclibc.patch create mode 100644 testing/open-vm-tools/ecvt.patch create mode 100644 testing/open-vm-tools/getloadavg-uclibc.patch create mode 100644 testing/open-vm-tools/iconv-uclibc.patch create mode 100644 testing/open-vm-tools/libm.patch create mode 100644 testing/open-vm-tools/open-vm-tools.desktop create mode 100644 testing/open-vm-tools/open-vm-tools.initd create mode 100644 testing/open-vm-tools/open-vm.confd create mode 100644 testing/open-vm-tools/open-vm.initd create mode 100644 testing/open-vm-tools/resume-vm-default.patch create mode 100644 testing/open-vm-tools/suspend-vm-default.patch (limited to 'testing') diff --git a/testing/open-vm-tools/APKBUILD b/testing/open-vm-tools/APKBUILD new file mode 100644 index 0000000000..97a3a7753a --- /dev/null +++ b/testing/open-vm-tools/APKBUILD @@ -0,0 +1,109 @@ +# Maintainer: Natanael Copa +pkgname=open-vm-tools +pkgver=8.4.2 +_pkgsubver=261024 +pkgrel=0 +pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." +url="http://open-vm-tools.sourceforge.net/" +license="LGPL" +subpackages="$pkgname-gtk" +makedepends="procps-dev libdnet-dev icu-dev glib-dev pkgconfig bash + libtirpc-dev rpcgen icu-dev automake autoconf + gtk+-dev libxext-dev libxinerama-dev libxtst-dev gtkmm-dev + libnotify-dev libxrandr-dev + " +source="http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-$_pkgsubver.tar.gz + getloadavg-uclibc.patch + codeset-uclibc.patch + ecvt.patch + iconv-uclibc.patch + libm.patch + checkvm-pie-safety.patch + resume-vm-default.patch + suspend-vm-default.patch + open-vm-tools.initd + open-vm.initd + open-vm.confd + " + +_builddir="$srcdir"/$pkgname-$pkgver-$_pkgsubver + +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + [ -r "$i" ] || continue + patch -p1 -i "$i" || return 1 + done + + sed -i -e 's/__unused1/st_atim.tv_nsec/g' \ + -e 's/__unused2/st_mtim.tv_nsec/g' \ + -e 's/__unused3/st_ctim.tv_nsec/g' \ + lib/file/filePosix.c lib/hgfsServer/hgfsServerLinux.c \ + || return 1 + + # workaround automake-1.10 issue + # http://ramblingfoo.blogspot.com/2007/07/required-file-configrpath-not-found.html + touch config/config.rpath + aclocal -I m4 && autoconf && automake +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --disable-unity \ + --with-dnet \ + --with-icu \ + --with-procps \ + --with-x \ + --without-kernel-modules \ + --without-pam \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make install DESTDIR=$pkgdir || return 1 + + # one of the plugins seems to be linked to libhgfsServer + # create a link to abuild gets happy + ln -s open-vm-tools/plugins/vmsvc/libhgfsServer.so \ + "$pkgdir"/usr/lib/libhgfsServer.so.0 + + # dont bother create a -dev package + rm -f "$pkgdir"/usr/lib/*.a "$pkgdir"/usr/lib/*.la + + install -Dm644 "$srcdir"/open-vm-tools.desktop \ + "$pkgdir"/etc/xdg/open-vm-tools.desktop + install -Dm755 "$srcdir"/open-vm-tools.initd \ + "$pkgdir"/etc/init.d/open-vm-tools + install -Dm644 "$srcdir"/open-vm.confd "$pkgdir"/etc/conf.d/open-vm + install -Dm755 "$srcdir"/open-vm.initd "$pkgdir"/etc/init.d/open-vm +} + +gtk() { + pkgdesc="Xorg apps and plugins for open-vm-tools" + mkdir -p "$subpkgdir"/usr/bin \ + "$subpkgdir"/usr/lib/open-vm-tools/plugins/vmusr \ + "$subpkgdir"/etc/ + mv "$pkgdir"/usr/bin/vmware-toolbox \ + "$pkgdir"/usr/bin/vmware-user \ + "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/lib/open-vm-tools/plugins/vmusr/libresolutionSet.so \ + "$pkgdir"/usr/lib/open-vm-tools/plugins/vmusr/libvixUser.so \ + "$subpkgdir"/usr/lib/open-vm-tools/plugins/vmusr/ + mv "$pkgdir"/etc/xdg "$subpkgdir"/etc/ +} + +md5sums="4d9ddc865b42fc6982c3078031500486 open-vm-tools-8.4.2-261024.tar.gz +bf2398b976d849bfd29a02763984a68a getloadavg-uclibc.patch +82840b6bed002284b9bd2358707ee826 codeset-uclibc.patch +840e4d6ff3f53fc22bdedf4d64aabc91 ecvt.patch +454827c50f5b1290dd647717e87d0f5a iconv-uclibc.patch +7d02fc25aba5c248f3d98dac238f175b libm.patch +7ba4dea8fc5c285e4837f9e33d835083 checkvm-pie-safety.patch +2606c0d5b180a77634ad26343d68852d resume-vm-default.patch +c6d7a6640bb26c22e632aea21b04227b suspend-vm-default.patch +c79ca03660fa75d00028325f53a37b4e open-vm-tools.initd +b56e3e6ebde04054b27e23e7c6d0d22c open-vm.initd +2570d31a242f40eae8f8f2517536dd5f open-vm.confd" diff --git a/testing/open-vm-tools/checkvm-pie-safety.patch b/testing/open-vm-tools/checkvm-pie-safety.patch new file mode 100644 index 0000000000..5a879c94b7 --- /dev/null +++ b/testing/open-vm-tools/checkvm-pie-safety.patch @@ -0,0 +1,67 @@ +From: Gordon Malm + +Make inline asm PIC-safe (do not clobber ebx). + +Thanks and credit to Anthony Basile for all his help and testing. + +Reference: http://bugs.gentoo.org/200376 + +--- a/checkvm/checkvm.c ++++ b/checkvm/checkvm.c +@@ -79,8 +79,16 @@ + { + uint32 eax, ebx, ecx, edx; + +- __asm__ volatile("inl (%%dx)" : +- "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : ++ __asm__ volatile( ++#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler. ++ "movl %%ebx, %3 \n\t" ++ "inl (%%dx) \n\t" ++ "xchgl %%ebx, %3 \n\t" : ++ "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) : ++#else ++ "inl (%%dx)" : ++ "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : ++#endif + "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETVERSION), + "2"(BDOOR_PORT) : "memory"); + version[0] = eax; +@@ -96,8 +104,16 @@ + { + uint32 eax, ebx, ecx, edx; + +- __asm__ volatile("inl (%%dx)" : +- "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : ++ __asm__ volatile( ++#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler. ++ "movl %%ebx, %3 \n\t" ++ "inl (%%dx) \n\t" ++ "xchgl %%ebx, %3 \n\t" : ++ "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) : ++#else ++ "inl (%%dx)" : ++ "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : ++#endif + "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETHWVERSION), + "2"(BDOOR_PORT) : "memory"); + *hwVersion = eax; +@@ -112,8 +128,16 @@ + { + uint32 eax, ebx, ecx, edx; + +- __asm__ volatile("inl (%%dx)" : +- "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : ++ __asm__ volatile( ++#if defined __PIC__ && !vm_x86_64 // %ebx is reserved by the compiler. ++ "movl %%ebx, %3 \n\t" ++ "inl (%%dx) \n\t" ++ "xchgl %%ebx, %3 \n\t" : ++ "=a"(eax), "=c"(ecx), "=d"(edx), "=r"(ebx) : ++#else ++ "inl (%%dx)" : ++ "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : ++#endif + "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETSCREENSIZE), + "2"(BDOOR_PORT) : "memory"); + *screensize = eax; diff --git a/testing/open-vm-tools/codeset-uclibc.patch b/testing/open-vm-tools/codeset-uclibc.patch new file mode 100644 index 0000000000..b26df16611 --- /dev/null +++ b/testing/open-vm-tools/codeset-uclibc.patch @@ -0,0 +1,20 @@ +--- ./lib/misc/codesetOld.c.orig ++++ ./lib/misc/codesetOld.c +@@ -723,7 +723,7 @@ + { + char *codeset; + +-#if defined(__linux__) ++#if defined(__linux__) && !defined(__UCLIBC__) + + locale_t new = newlocale(LC_CTYPE_MASK, "", NULL); + if (!new) { +@@ -739,7 +739,7 @@ + codeset = Util_SafeStrdup(nl_langinfo_l(CODESET, new)); + freelocale(new); + +-#elif defined(sun) ++#elif defined(sun) || defined(__UCLIBC__) + + char *locale = setlocale(LC_CTYPE, NULL); + if (!setlocale(LC_CTYPE, "")) { diff --git a/testing/open-vm-tools/ecvt.patch b/testing/open-vm-tools/ecvt.patch new file mode 100644 index 0000000000..53e88e9989 --- /dev/null +++ b/testing/open-vm-tools/ecvt.patch @@ -0,0 +1,205 @@ +commit e996e91ca5951c50769dcaa8e074daa973006849 +Author: Natanael Copa +Date: Thu Jul 8 06:39:36 2010 +0000 + + add ecvt() implementation + +diff --git a/lib/string/Makefile.am b/lib/string/Makefile.am +index 1edab81..5f2e7ab 100644 +--- a/lib/string/Makefile.am ++++ b/lib/string/Makefile.am +@@ -23,6 +23,7 @@ libString_la_SOURCES += bsd_vsnprintf.c + libString_la_SOURCES += bsd_vsnwprintf.c + libString_la_SOURCES += convertutf.c + libString_la_SOURCES += str.c ++libString_la_SOURCES += ecvt.c + + AM_CFLAGS = @LIB_STRING_CPPFLAGS@ + +diff --git a/lib/string/bsd_output_shared.c b/lib/string/bsd_output_shared.c +index 3616947..321d6f1 100644 +--- a/lib/string/bsd_output_shared.c ++++ b/lib/string/bsd_output_shared.c +@@ -64,6 +64,9 @@ + + #ifndef NO_FLOATING_POINT + ++extern char* ecvt(double arg, int ndigits, int *decptp, int *signp); ++extern char* fcvt(double arg, int ndigits, int *decptp, int *signp); ++ + /* + *----------------------------------------------------------------------------- + * +diff --git a/lib/string/ecvt.c b/lib/string/ecvt.c +new file mode 100644 +index 0000000..1979c3d +--- /dev/null ++++ b/lib/string/ecvt.c +@@ -0,0 +1,167 @@ ++/* ++ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved. ++ * ++ * @APPLE_LICENSE_HEADER_START@ ++ * ++ * This file contains Original Code and/or Modifications of Original Code ++ * as defined in and that are subject to the Apple Public Source License ++ * Version 2.0 (the 'License'). You may not use this file except in ++ * compliance with the License. Please obtain a copy of the License at ++ * http://www.opensource.apple.com/apsl/ and read it before using this ++ * file. ++ * ++ * The Original Code and all software distributed under the License are ++ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER ++ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, ++ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. ++ * Please see the License for the specific language governing rights and ++ * limitations under the License. ++ * ++ * @APPLE_LICENSE_HEADER_END@ ++ */ ++/* ++ * ecvt converts to decimal ++ * the number of digits is specified by ndigit ++ * decptp is set to the position of the decimal point ++ * signp is set to 0 for positive, 1 for negative ++ */ ++ ++ ++static double ecvt_rint(double x); ++ ++static char *cvt(); ++ ++/* big enough to handle %.20f conversion of 1e308 */ ++#define NDIG 350 ++ ++char* ++ecvt(arg, ndigits, decptp, signp) ++double arg; ++int ndigits, *decptp, *signp; ++{ ++ return(cvt(arg, ndigits, decptp, signp, 1)); ++} ++ ++char* ++fcvt(arg, ndigits, decptp, signp) ++double arg; ++int ndigits, *decptp, *signp; ++{ ++ return(cvt(arg, ndigits, decptp, signp, 0)); ++} ++ ++static char* ++cvt(arg, ndigits, decptp, signp, eflag) ++double arg; ++int ndigits, *decptp, *signp; ++int eflag; ++{ ++ register int decpt; ++ double fi, fj; ++ register char *p, *p1; ++ static char buf[NDIG] = { 0 }; ++ double modf(); ++ ++ if (ndigits < 0) ++ ndigits = 0; ++ if (ndigits >= NDIG-1) ++ ndigits = NDIG-2; ++ ++ decpt = 0; ++ *signp = 0; ++ p = &buf[0]; ++ ++ if (arg == 0) { ++ *decptp = 0; ++ while (p < &buf[ndigits]) ++ *p++ = '0'; ++ *p = '\0'; ++ return(buf); ++ } else if (arg < 0) { ++ *signp = 1; ++ arg = -arg; ++ } ++ ++ arg = modf(arg, &fi); ++ p1 = &buf[NDIG]; ++ ++ /* ++ * Do integer part ++ */ ++ if (fi != 0) { ++ while (fi != 0) { ++ fj = modf(fi/10, &fi); ++ /**--p1 = (int)((fj+.03)*10) + '0';*/ ++ *--p1 = (int)ecvt_rint((fj)*10) + '0'; ++ decpt++; ++ } ++ while (p1 < &buf[NDIG]) ++ *p++ = *p1++; ++ } else if (arg > 0) { ++ while ((fj = arg*10) < 1) { ++ arg = fj; ++ decpt--; ++ } ++ } ++ *decptp = decpt; ++ ++ /* ++ * do fraction part ++ * p pts to where fraction should be concatenated ++ * p1 is how far conversion must go to ++ */ ++ p1 = &buf[ndigits]; ++ if (eflag==0) { ++ /* fcvt must provide ndigits after decimal pt */ ++ p1 += decpt; ++ /* if decpt was negative, we might done for fcvt */ ++ if (p1 < &buf[0]) { ++ buf[0] = '\0'; ++ return(buf); ++ } ++ } ++ while (p <= p1 && p < &buf[NDIG]) { ++ arg *= 10; ++ arg = modf(arg, &fj); ++ *p++ = (int)fj + '0'; ++ } ++ /* ++ * if we converted all the way to the end of the ++ * buf, don't mess with rounding since there's nothing ++ * significant out here anyway ++ */ ++ if (p1 >= &buf[NDIG]) { ++ buf[NDIG-1] = '\0'; ++ return(buf); ++ } ++ /* ++ * round by adding 5 to last digit and propagating ++ * carries ++ */ ++ p = p1; ++ *p1 += 5; ++ while (*p1 > '9') { ++ *p1 = '0'; ++ if (p1 > buf) ++ ++*--p1; ++ else { ++ *p1 = '1'; ++ (*decptp)++; ++ if (eflag == 0) { ++ if (p > buf) ++ *p = '0'; ++ p++; ++ } ++ } ++ } ++ *p = '\0'; ++ return(buf); ++} ++ ++static double ecvt_rint(double x) ++{ ++ asm("frndint" : "=t" (x) : "0" (x)); ++ return(x); ++} ++ diff --git a/testing/open-vm-tools/getloadavg-uclibc.patch b/testing/open-vm-tools/getloadavg-uclibc.patch new file mode 100644 index 0000000000..247bd70374 --- /dev/null +++ b/testing/open-vm-tools/getloadavg-uclibc.patch @@ -0,0 +1,22 @@ +diff --git a/lib/misc/hostinfoPosix.c b/lib/misc/hostinfoPosix.c +index eeeb620..67387be 100644 +--- a/lib/misc/hostinfoPosix.c ++++ b/lib/misc/hostinfoPosix.c +@@ -1355,8 +1355,16 @@ HostinfoGetLoadAverage(float *avg0, // IN/OUT: + float *avg1, // IN/OUT: + float *avg2) // IN/OUT: + { ++#if defined(__UCLIBC__) ++ FILE *f; ++ if ((f = fopen("/proc/loadavg", "r")) == NULL) ++ return FALSE; ++ fscanf(f, "%f %f %f", avg0, avg1, avg2); ++ fclose(f); ++ return TRUE; ++ + /* getloadavg(3) was introduced with glibc 2.2 */ +-#if defined(GLIBC_VERSION_22) || defined(__APPLE__) ++#elif defined(GLIBC_VERSION_22) || defined(__APPLE__) + double avg[3]; + int res; + diff --git a/testing/open-vm-tools/iconv-uclibc.patch b/testing/open-vm-tools/iconv-uclibc.patch new file mode 100644 index 0000000000..6b256db880 --- /dev/null +++ b/testing/open-vm-tools/iconv-uclibc.patch @@ -0,0 +1,12 @@ +--- ./configure.ac.orig ++++ ./configure.ac +@@ -1059,6 +1059,9 @@ + AC_DEFINE([NO_MULTIMON], 1, [Define to 1 if building without multimon support.]) + fi + ++AM_ICONV ++LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD $LIBICONV" ++ + if test "$os$userSpaceBitness" = "linux64" || test "$HAVE_SYS_SETUID" = "yes"; then + LIB_MISC_CPPFLAGS="$LIB_MISC_CPPFLAGS -DGLIBC_VERSION_21" + fi diff --git a/testing/open-vm-tools/libm.patch b/testing/open-vm-tools/libm.patch new file mode 100644 index 0000000000..cd013f4d20 --- /dev/null +++ b/testing/open-vm-tools/libm.patch @@ -0,0 +1,18 @@ +--- a/hgfsmounter/Makefile.am ++++ b/hgfsmounter/Makefile.am +@@ -23,6 +23,7 @@ + mount_vmhgfs_LDADD += ../lib/panicDefault/libPanicDefault.la + mount_vmhgfs_LDADD += ../lib/panic/libPanic.la + mount_vmhgfs_LDADD += ../lib/stubs/libStubs.la ++mount_vmhgfs_LDADD += -lm + + mount_vmhgfs_SOURCES = + mount_vmhgfs_SOURCES += hgfsmounter.c +--- a/rpctool/Makefile.am ++++ b/rpctool/Makefile.am +@@ -25,4 +25,5 @@ + vmware_rpctool_LDADD += ../lib/message/libMessage.la + vmware_rpctool_LDADD += ../lib/backdoor/libBackdoor.la + vmware_rpctool_LDADD += ../lib/string/libString.la ++vmware_rpctool_LDADD += -lm + diff --git a/testing/open-vm-tools/open-vm-tools.desktop b/testing/open-vm-tools/open-vm-tools.desktop new file mode 100644 index 0000000000..2107a62e0b --- /dev/null +++ b/testing/open-vm-tools/open-vm-tools.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Exec=vmware-user +Name=VMware User Agent +X-KDE-autostart-phase=1 +NoDisplay=true diff --git a/testing/open-vm-tools/open-vm-tools.initd b/testing/open-vm-tools/open-vm-tools.initd new file mode 100644 index 0000000000..ee85c4d297 --- /dev/null +++ b/testing/open-vm-tools/open-vm-tools.initd @@ -0,0 +1,76 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd,v 1.2 2009/12/20 14:05:43 vadimk Exp $ + +DND_TMPDIR="/tmp/VMwareDnD" +USER_GROUP="root:vmware" +DND_TMPDIR_PERMS="1777" +GUESTD_BIN="/usr/bin/vmtoolsd" +PIDFILE="/var/run/vmtoolsd.pid" +MOUNTPOINT="/proc/fs/vmblock/mountPoint" + +depend() { + before checkfs fsck net X +} + +start() { + if [ "${VM_DRAG_AND_DROP}" == "yes" ]; + then + + if ! grep -q -w vmblock /proc/modules; + then + ebegin "Loading vmblock module" + modprobe vmblock + eend $? + sleep 0.25 + fi + + if [[ ! -d "${DND_TMPDIR}" ]]; + then + # einfo "Creating the VM drag and drop directory" + mkdir "${DND_TMPDIR}" + chown "${USER_GROUP}" "${DND_TMPDIR}" + chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}" + fi + + # DnD_TMPDIR must exist before vmblock can be mounted + ebegin "Mounting vmblock device" + mount -t vmblock none ${MOUNTPOINT} + eend $? + fi + + ebegin "Starting vmtoolsd" + start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN} + eend $? +} + +stop() { + local ret + + if [ "${VM_DRAG_AND_DROP}" == "yes" ]; + then + ebegin "Cleaning the contents of ${DND_TMPDIR}" + # First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/* + if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]]; + then + rm -rf ${DND_TMPDIR}/* + ret=0 + else + eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable" + ret=1 + fi + eend $ret + + ebegin "Unmounting vmblock device" + if grep -q -w "${MOUNTPOINT}" /proc/mounts; + then + umount ${MOUNTPOINT} 1>&2 > /dev/null + fi + eend 0 + fi + + ebegin "Stopping vmtoolsd" + start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" + eend $? +} diff --git a/testing/open-vm-tools/open-vm.confd b/testing/open-vm-tools/open-vm.confd new file mode 100644 index 0000000000..4414fabdb4 --- /dev/null +++ b/testing/open-vm-tools/open-vm.confd @@ -0,0 +1,2 @@ +# Set this to no to disable drag and drop (and vmblock) loading. +VM_DRAG_AND_DROP="yes" diff --git a/testing/open-vm-tools/open-vm.initd b/testing/open-vm-tools/open-vm.initd new file mode 100644 index 0000000000..d4f96cc876 --- /dev/null +++ b/testing/open-vm-tools/open-vm.initd @@ -0,0 +1,76 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm.initd,v 1.2 2008/02/01 12:33:36 flameeyes Exp $ + +DND_TMPDIR="/tmp/VMwareDnD" +USER_GROUP="root:vmware" +DND_TMPDIR_PERMS="1777" +GUESTD_BIN="/usr/sbin/vmware-guestd" +PIDFILE="/var/run/vmware-guestd.pid" +MOUNTPOINT="/proc/fs/vmblock/mountPoint" + +depend() { + before checkfs fsck net X +} + +start() { + if [ "${VM_DRAG_AND_DROP}" == "yes" ]; + then + + if ! grep -q -w vmblock /proc/modules; + then + ebegin "Loading vmblock module" + modprobe vmblock + eend $? + sleep 0.25 + fi + + if [[ ! -d "${DND_TMPDIR}" ]]; + then + # einfo "Creating the VM drag and drop directory" + mkdir "${DND_TMPDIR}" + chown "${USER_GROUP}" "${DND_TMPDIR}" + chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}" + fi + + # DnD_TMPDIR must exist before vmblock can be mounted + ebegin "Mounting vmblock device" + mount -t vmblock none ${MOUNTPOINT} + eend $? + fi + + ebegin "Starting vmware-guestd" + start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --exec ${GUESTD_BIN} -- --background "${PIDFILE}" + eend $? +} + +stop() { + local ret + + if [ "${VM_DRAG_AND_DROP}" == "yes" ]; + then + ebegin "Cleaning the contents of ${DND_TMPDIR}" + # First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/* + if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]]; + then + rm -rf ${DND_TMPDIR}/* + ret=0 + else + eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable" + ret=1 + fi + eend $ret + + ebegin "Unmounting vmblock device" + if grep -q -w "${MOUNTPOINT}" /proc/mounts; + then + umount ${MOUNTPOINT} 1>&2 > /dev/null + fi + eend 0 + fi + + ebegin "Stopping vmware-guestd" + start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" + eend $? +} diff --git a/testing/open-vm-tools/resume-vm-default.patch b/testing/open-vm-tools/resume-vm-default.patch new file mode 100644 index 0000000000..4d89a47f52 --- /dev/null +++ b/testing/open-vm-tools/resume-vm-default.patch @@ -0,0 +1,49 @@ +--- ./scripts/linux/resume-vm-default.orig ++++ ./scripts/linux/resume-vm-default +@@ -25,37 +25,6 @@ + echo `date` ": Executing '$0'" + echo + +-find_networking_script() { +- local script="error" +- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do +- if [ -d "$dir/rc0.d" ] && +- [ -d "$dir/rc1.d" ] && +- [ -d "$dir/rc2.d" ] && +- [ -d "$dir/rc3.d" ] && +- [ -d "$dir/rc4.d" ] && +- [ -d "$dir/rc5.d" ] && +- [ -d "$dir/rc6.d" ]; then +- +- # Now find the appropriate networking script. +- if [ -d "$dir/init.d" ]; then +- if [ -x "$dir/init.d/network" ]; then +- script="$dir/init.d/network" +- elif [ -x "$dir/init.d/networking" ]; then +- script="$dir/init.d/networking" +- fi +- else +- if [ -x "$dir/network" ]; then +- script="$dir/network" +- elif [ -x "$dir/networking" ]; then +- script="$dir/networking" +- fi +- fi +- fi +- done +- +- echo "$script" +-} +- + rescue_NIC() { + niclist="/var/run/vmware-active-nics" + +@@ -121,7 +90,7 @@ + + wakeNetworkManager + +-network=`find_networking_script` ++network=/etc/init.d/networking + if [ "$network" != "error" ]; then + "$network" restart + # Continue even if the networking init script wasn't successful. diff --git a/testing/open-vm-tools/suspend-vm-default.patch b/testing/open-vm-tools/suspend-vm-default.patch new file mode 100644 index 0000000000..38f8ae71d8 --- /dev/null +++ b/testing/open-vm-tools/suspend-vm-default.patch @@ -0,0 +1,49 @@ +--- a/scripts/linux/suspend-vm-default.org 2009-05-13 15:02:03.000000000 +0400 ++++ b/scripts/linux/suspend-vm-default 2009-05-13 15:05:18.394228810 +0400 +@@ -25,37 +25,6 @@ + echo `date` ": Executing '$0'" + echo + +-find_networking_script() { +- local script="error" +- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do +- if [ -d "$dir/rc0.d" ] && +- [ -d "$dir/rc1.d" ] && +- [ -d "$dir/rc2.d" ] && +- [ -d "$dir/rc3.d" ] && +- [ -d "$dir/rc4.d" ] && +- [ -d "$dir/rc5.d" ] && +- [ -d "$dir/rc6.d" ]; then +- +- # Now find the appropriate networking script. +- if [ -d "$dir/init.d" ]; then +- if [ -x "$dir/init.d/network" ]; then +- script="$dir/init.d/network" +- elif [ -x "$dir/init.d/networking" ]; then +- script="$dir/init.d/networking" +- fi +- else +- if [ -x "$dir/network" ]; then +- script="$dir/network" +- elif [ -x "$dir/networking" ]; then +- script="$dir/networking" +- fi +- fi +- fi +- done +- +- echo "$script" +-} +- + save_active_NIC_list() { + ifconfig_path=`which ifconfig 2>/dev/null` + if [ $? ]; then +@@ -76,7 +45,7 @@ + + save_active_NIC_list + +-network=`find_networking_script` ++network=/etc/init.d/networking + if [ "$network" != "error" ]; then + "$network" stop + # If the network is down, this may fail but that's not a good reason -- cgit v1.2.3 From 9739ab75470831c13eb72d1bd14b0405ca56a8a4 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 12 Jul 2010 09:42:30 +0000 Subject: testing/mdocml: upgrade to 1.10.4 --- testing/mdocml/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/mdocml/APKBUILD b/testing/mdocml/APKBUILD index 7fd6fd32af..03ede31f40 100644 --- a/testing/mdocml/APKBUILD +++ b/testing/mdocml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: # Maintainer: pkgname=mdocml -pkgver=1.10.2 +pkgver=1.10.4 pkgrel=0 pkgdesc="Roff implementation" url="http://mdocml.bsd.lv/" @@ -30,4 +30,4 @@ package() { EXAMPLEDIR=/usr/share/doc/mdocml/examples install } -md5sums="aa52d80c5ccbd2d6d434c63c2435a060 mdocml-1.10.2.tar.gz" +md5sums="f23e40cd64f4312b0c4e2d72e7999298 mdocml-1.10.4.tar.gz" -- cgit v1.2.3 From 05f7b76a0d044693460872278223eb03746b20ea Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Tue, 13 Jul 2010 08:35:30 +0000 Subject: testing/squidguard: new aport --- testing/squidguard/APKBUILD | 46 ++++++++++++++ testing/squidguard/blockedsites | 1 + testing/squidguard/squidGuard.conf.blocksites | 13 ++++ testing/squidguard/squidGuard.conf.minimal | 7 ++ testing/squidguard/squidguard-1.4-gentoo.patch | 74 ++++++++++++++++++++++ .../squidguard/squidguard-1.4-upstream-fixes.patch | 24 +++++++ testing/squidguard/squidguard-1.4-vsnprintf.patch | 44 +++++++++++++ testing/squidguard/squidguard.post-install | 3 + 8 files changed, 212 insertions(+) create mode 100644 testing/squidguard/APKBUILD create mode 100644 testing/squidguard/blockedsites create mode 100644 testing/squidguard/squidGuard.conf.blocksites create mode 100644 testing/squidguard/squidGuard.conf.minimal create mode 100644 testing/squidguard/squidguard-1.4-gentoo.patch create mode 100644 testing/squidguard/squidguard-1.4-upstream-fixes.patch create mode 100644 testing/squidguard/squidguard-1.4-vsnprintf.patch create mode 100644 testing/squidguard/squidguard.post-install (limited to 'testing') diff --git a/testing/squidguard/APKBUILD b/testing/squidguard/APKBUILD new file mode 100644 index 0000000000..522386ea2e --- /dev/null +++ b/testing/squidguard/APKBUILD @@ -0,0 +1,46 @@ +# Maintainer: Leonardo Arena +pkgname=squidguard +_realname=squidGuard +pkgver=1.4 +pkgrel=0 +pkgdesc="Squid URL redirector" +url="http://www.squidguard.org" +license="GPL" +depends= +makedepends="flex bison db-dev" +install="$pkgname.post-install" +subpackages="" +source="http://www.squidguard.org/Downloads/$_realname-$pkgver.tar.gz + squidguard-1.4-gentoo.patch + squidguard-1.4-upstream-fixes.patch + squidguard-1.4-vsnprintf.patch" + +_builddir="$srcdir"/$_realname-$pkgver + +prepare() { + cd "$_builddir" + patch -p1 < ../../squidguard-1.4-gentoo.patch + patch -p1 < ../../squidguard-1.4-upstream-fixes.patch + patch -p1 < ../../squidguard-1.4-vsnprintf.patch +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-sg-config=/etc/squidGuard/squidGuard.conf \ + --with-sg-logdir=/var/log/squidGuard + make || return 1 +} + +package() { + cd "$_builddir" + make INSTDIR="$pkgdir" install + install -D -m644 ../../squidGuard.conf.blocksites $pkgdir/etc/squidGuard/squidGuard.conf + install -D -m644 ../../blockedsites $pkgdir/etc/squidGuard/blockedsites +} + +md5sums="de834150998c1386c30feae196f16b06 squidGuard-1.4.tar.gz +ba58e934fe2f75fcb5dfbe054e045449 squidguard-1.4-gentoo.patch +4b512e930dede70ddf36d4f7c75a598f squidguard-1.4-upstream-fixes.patch +8878c72f27e45dab99e5d0197d50caec squidguard-1.4-vsnprintf.patch" diff --git a/testing/squidguard/blockedsites b/testing/squidguard/blockedsites new file mode 100644 index 0000000000..46279a47ee --- /dev/null +++ b/testing/squidguard/blockedsites @@ -0,0 +1 @@ +sex.com diff --git a/testing/squidguard/squidGuard.conf.blocksites b/testing/squidguard/squidGuard.conf.blocksites new file mode 100644 index 0000000000..eaa8cdeef0 --- /dev/null +++ b/testing/squidguard/squidGuard.conf.blocksites @@ -0,0 +1,13 @@ +logdir /var/log/squidGuard +dbhome /etc/squidGuard/db + +dest blockedsites { + domainlist blockedsites +} + +acl { + default { + pass !blockedsites all + redirect http://www.sample.com/empty.png + } +} diff --git a/testing/squidguard/squidGuard.conf.minimal b/testing/squidguard/squidGuard.conf.minimal new file mode 100644 index 0000000000..3b0ebf55c7 --- /dev/null +++ b/testing/squidguard/squidGuard.conf.minimal @@ -0,0 +1,7 @@ +logdir /var/log/squidGuard + +acl { + default { + pass all + } +} diff --git a/testing/squidguard/squidguard-1.4-gentoo.patch b/testing/squidguard/squidguard-1.4-gentoo.patch new file mode 100644 index 0000000000..60b5461e9e --- /dev/null +++ b/testing/squidguard/squidguard-1.4-gentoo.patch @@ -0,0 +1,74 @@ +diff -Nru squidGuard-1.4.orig/Makefile.in squidGuard-1.4/Makefile.in +--- squidGuard-1.4.orig/Makefile.in 2008-05-17 18:36:44.000000000 +0000 ++++ squidGuard-1.4/Makefile.in 2009-01-10 13:02:14.000000000 +0000 +@@ -43,7 +43,7 @@ + # Dependencies for installing + # + +-install: install-build install-conf ++install: install-build + + install-conf: + @echo Installing configuration file ; +@@ -85,10 +85,10 @@ + + install-build: + @echo Installing squidGuard +- @if [ ! -d $(bindir) ]; then \ +- $(MKINSTALLDIRS) $(bindir) ; \ ++ @if [ ! -d "$(INSTDIR)"/$(bindir) ]; then \ ++ $(MKINSTALLDIRS) "$(INSTDIR)"/$(bindir) ; \ + fi ; \ +- cp src/squidGuard $(bindir) || exit 1 ; \ ++ cp src/squidGuard "$(INSTDIR)"/$(bindir) || exit 1 ; \ + echo Done. ; + + clean:: +diff -Nru squidGuard-1.4.orig/src/Makefile.in squidGuard-1.4/src/Makefile.in +--- squidGuard-1.4.orig/src/Makefile.in 2009-01-03 20:05:39.000000000 +0000 ++++ squidGuard-1.4/src/Makefile.in 2009-01-10 13:02:14.000000000 +0000 +@@ -110,6 +110,8 @@ + mv -f y.tab.c y.tab.c.bison + mv -f y.tab.h y.tab.h.bison + ++sg.y sg.l: ++ + # + # Dependencies for installing + # +@@ -122,8 +124,8 @@ + + install.bin:: squidGuard + @echo making $@ in `basename \`pwd\`` +- @$(MKDIR) $(bindir) $(logdir) $(cfgdir) +- $(INSTALL_PROGRAM) squidGuard $(bindir)/squidGuard ++ @$(MKDIR) "$(INSTDIR)"/$(bindir) "$(INSTDIR)"/$(logdir) "$(INSTDIR)"/$(cfgdir) ++ $(INSTALL_PROGRAM) squidGuard "$(INSTDIR)"/$(bindir)/squidGuard + + uninstall.bin:: + @echo making $@ in `basename \`pwd\`` +diff -Nru squidGuard-1.4.orig/src/sgDb.c squidGuard-1.4/src/sgDb.c +--- squidGuard-1.4.orig/src/sgDb.c 2008-07-14 18:29:41.000000000 +0000 ++++ squidGuard-1.4/src/sgDb.c 2009-01-10 13:02:14.000000000 +0000 +@@ -103,13 +103,21 @@ + if(createdb) + flag = flag | DB_TRUNCATE; + if ((ret = ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) ++ Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { ++#else + Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { ++#endif + (void) Db->dbp->close(Db->dbp, 0); + sgLogFatalError("Error db_open: %s", strerror(ret)); + } + } else { + if ((ret = ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) ++ Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { ++#else + Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { ++#endif + sgLogFatalError("Error db_open: %s", strerror(ret)); + } + } diff --git a/testing/squidguard/squidguard-1.4-upstream-fixes.patch b/testing/squidguard/squidguard-1.4-upstream-fixes.patch new file mode 100644 index 0000000000..007e6b4c36 --- /dev/null +++ b/testing/squidguard/squidguard-1.4-upstream-fixes.patch @@ -0,0 +1,24 @@ +diff -Nru squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4/src/sgDiv.c.in +--- squidGuard-1.4.orig/src/sgDiv.c.in 2008-07-14 18:02:43.000000000 +0200 ++++ squidGuard-1.4/src/sgDiv.c.in 2009-11-28 09:33:05.000000000 +0100 +@@ -745,7 +745,7 @@ + p++; + break; + case 'u': /* Requested URL */ +- strcat(buf, req->orig); ++ strncat(buf, req->orig, 2048); + p++; + break; + default: +diff -Nru squidGuard-1.4.orig/src/sg.h.in squidGuard-1.4/src/sg.h.in +--- squidGuard-1.4.orig/src/sg.h.in 2007-11-16 17:58:32.000000000 +0100 ++++ squidGuard-1.4/src/sg.h.in 2009-11-28 09:33:37.000000000 +0100 +@@ -73,7 +73,7 @@ + #define REQUEST_TYPE_REDIRECT 2 + #define REQUEST_TYPE_PASS 3 + +-#define MAX_BUF 4096 ++#define MAX_BUF 12288 + + #define DEFAULT_LOGFILE "squidGuard.log" + #define WARNING_LOGFILE "squidGuard.log" diff --git a/testing/squidguard/squidguard-1.4-vsnprintf.patch b/testing/squidguard/squidguard-1.4-vsnprintf.patch new file mode 100644 index 0000000000..bf4efec604 --- /dev/null +++ b/testing/squidguard/squidguard-1.4-vsnprintf.patch @@ -0,0 +1,44 @@ +diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in +--- squidGuard-1.4.orig/configure.in 2009-04-26 12:28:49.000000000 +0000 ++++ squidGuard-1.4/configure.in 2009-04-26 12:29:35.000000000 +0000 +@@ -421,7 +421,7 @@ + AC_CHECK_FUNCS(regexec, , AC_MSG_ERROR([No regexec library function.])) + AC_CHECK_FUNCS(strdup, , AC_MSG_ERROR([No strdup library function.])) + AC_CHECK_FUNCS(strerror, , AC_MSG_ERROR([No strerror library function.])) +-AC_CHECK_FUNCS(vsprintf, , AC_MSG_ERROR([No vsprintf library function.])) ++AC_CHECK_FUNCS(vsnprintf, , AC_MSG_ERROR([No vsnprintf library function.])) + AC_CHECK_FUNCS(sigaction) + AC_CHECK_FUNCS(signal) + +diff -Nru squidGuard-1.4.orig/src/sgLog.c squidGuard-1.4/src/sgLog.c +--- squidGuard-1.4.orig/src/sgLog.c 2007-11-16 16:58:32.000000000 +0000 ++++ squidGuard-1.4/src/sgLog.c 2009-04-26 12:31:40.000000000 +0000 +@@ -55,7 +55,7 @@ + char msg[MAX_BUF]; + va_list ap; + VA_START(ap, format); +- if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) ++ if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) + fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno)); + va_end(ap); + date = niso(0); +@@ -87,8 +87,8 @@ + char msg[MAX_BUF]; + va_list ap; + VA_START(ap, format); +- if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) +- sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno)); ++ if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) ++ fprintf(stderr,"overflow in vsprintf (sgLogError): %s",strerror(errno)); + va_end(ap); + sgLog(globalErrorLog,"%s",msg); + } +@@ -104,7 +104,7 @@ + char msg[MAX_BUF]; + va_list ap; + VA_START(ap, format); +- if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) ++ if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) + return; + va_end(ap); + sgLog(globalErrorLog,"%s",msg); diff --git a/testing/squidguard/squidguard.post-install b/testing/squidguard/squidguard.post-install new file mode 100644 index 0000000000..2620de05f4 --- /dev/null +++ b/testing/squidguard/squidguard.post-install @@ -0,0 +1,3 @@ +#!/bin/sh +mkdir /var/log/squidGuard &>/dev/null +chown squid.squid /var/log/squidGuard -- cgit v1.2.3 From acdab952ba95e25d63010cc425673d986bde9846 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 15 Jul 2010 15:04:00 +0000 Subject: testing/ivtv-utils: do not use uclibc++ --- testing/ivtv-utils/APKBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/ivtv-utils/APKBUILD b/testing/ivtv-utils/APKBUILD index 33bccec539..17e349d8a7 100644 --- a/testing/ivtv-utils/APKBUILD +++ b/testing/ivtv-utils/APKBUILD @@ -1,20 +1,23 @@ # Maintainer: Natanael Copa pkgname=ivtv-utils pkgver=1.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="Userspace utilities and firmware for Hauppauge PVR cards" url="http://ivtvdriver.org" license="GPL" depends= -makedepends="uclibc++-dev" +makedepends= source="http://dl.ivtvdriver.org/ivtv/stable/$pkgname-$pkgver.tar.gz http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz" build () { cd "$srcdir"/$pkgname-$pkgver - export CXX=${CXX_UC:-g++-uc} make || return 1 +} + +package() { + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" PREFIX=/usr install || return 1 cd "$srcdir" -- cgit v1.2.3 From 6c91a0ce1da8c2592e58ecc05ff34d8438d80201 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 16 Jul 2010 07:40:48 +0000 Subject: main/libgcrypt: upgrade to 1.4.6 --- testing/libgssglue/APKBUILD | 27 --------------------------- testing/libgssglue/gssapi_mech.conf | 22 ---------------------- 2 files changed, 49 deletions(-) delete mode 100644 testing/libgssglue/APKBUILD delete mode 100644 testing/libgssglue/gssapi_mech.conf (limited to 'testing') diff --git a/testing/libgssglue/APKBUILD b/testing/libgssglue/APKBUILD deleted file mode 100644 index 4701c765cf..0000000000 --- a/testing/libgssglue/APKBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=libgssglue -pkgver=0.1 -pkgrel=1 -pkgdesc="exports a gssapi interface which calls other random gssapi libraries" -url="http://www.citi.umich.edu/projects/nfsv4/linux/" -license="BSD" -depends= -subpackages="$pkgname-dev $pkgname-doc" -source="http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz - gssapi_mech.conf" - -_builddir="$srcdir"/$pkgname-$pkgver -build() { - cd "$_builddir" - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir/" install || return 1 - install -D -m 644 ../gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf - install -D -m644 COPYING $pkgdir/usr/share/licenses/libgssglue/COPYING -} -md5sums="ce1b4c758e6de01b712d154c5c97e540 libgssglue-0.1.tar.gz -234b9cca75a33af98eda3f1683756879 gssapi_mech.conf" diff --git a/testing/libgssglue/gssapi_mech.conf b/testing/libgssglue/gssapi_mech.conf deleted file mode 100644 index f71aca08ee..0000000000 --- a/testing/libgssglue/gssapi_mech.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Example /etc/gssapi_mech.conf file -# -# GSSAPI Mechanism Definitions -# -# This configuration file determines which GSS-API mechanisms -# the gssd code should use -# -# NOTE: -# The initiaiization function "mechglue_internal_krb5_init" -# is used for the MIT krb5 gssapi mechanism. This special -# function name indicates that an internal function should -# be used to determine the entry points for the MIT gssapi -# mechanism funtions. -# -# library initialization function -# ================================ ========================== -# The MIT K5 gssapi library, use special function for initialization. -#/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init -/usr/lib/libgssapi.so mechglue_internal_krb5_init -# -# The SPKM3 gssapi library function. Use the function spkm3_gss_initialize. -# /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so spkm3_gss_initialize -- cgit v1.2.3 From 36b1667c368adbc7cb916e6853fe273ac5212422 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 16 Jul 2010 13:34:48 +0000 Subject: testing/sshfs: new aport FUSE client based on the SSH File Transfer Protocol http://fuse.sourceforge.net/sshfs.html ref #210 --- testing/sshfs/APKBUILD | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 testing/sshfs/APKBUILD (limited to 'testing') diff --git a/testing/sshfs/APKBUILD b/testing/sshfs/APKBUILD new file mode 100644 index 0000000000..f911831236 --- /dev/null +++ b/testing/sshfs/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa +pkgname=sshfs +pkgver=2.2 +pkgrel=0 +pkgdesc="FUSE client based on the SSH File Transfer Protocol" +url="http://fuse.sourceforge.net/sshfs.html" +license="GPL" +depends="openssh-client" +makedepends="pkgconfig fuse-dev glib-dev" +source="http://downloads.sourceforge.net/sourceforge/fuse/sshfs-fuse-$pkgver.tar.gz" + +_builddir="$srcdir"/sshfs-fuse-$pkgver +build () +{ + cd "$_builddir" + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="26e9206eb5169e87e6f95f54bc005a4f sshfs-fuse-2.2.tar.gz" -- cgit v1.2.3 From d5d7b466437ac678d791937d8e4699bb4ff82fb8 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 16 Jul 2010 13:43:01 +0000 Subject: main/sshfs: moved from testing fixes #210 --- testing/sshfs/APKBUILD | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 testing/sshfs/APKBUILD (limited to 'testing') diff --git a/testing/sshfs/APKBUILD b/testing/sshfs/APKBUILD deleted file mode 100644 index f911831236..0000000000 --- a/testing/sshfs/APKBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=sshfs -pkgver=2.2 -pkgrel=0 -pkgdesc="FUSE client based on the SSH File Transfer Protocol" -url="http://fuse.sourceforge.net/sshfs.html" -license="GPL" -depends="openssh-client" -makedepends="pkgconfig fuse-dev glib-dev" -source="http://downloads.sourceforge.net/sourceforge/fuse/sshfs-fuse-$pkgver.tar.gz" - -_builddir="$srcdir"/sshfs-fuse-$pkgver -build () -{ - cd "$_builddir" - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 -} - -md5sums="26e9206eb5169e87e6f95f54bc005a4f sshfs-fuse-2.2.tar.gz" -- cgit v1.2.3 From 14593958f35ede9a92552e1abcd916871abe356f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 16 Jul 2010 14:03:53 +0000 Subject: main/awstats: moved from testing fixes #363 --- testing/awstats/APKBUILD | 58 ------------------------------------------------ 1 file changed, 58 deletions(-) delete mode 100644 testing/awstats/APKBUILD (limited to 'testing') diff --git a/testing/awstats/APKBUILD b/testing/awstats/APKBUILD deleted file mode 100644 index 4dddfdd1fe..0000000000 --- a/testing/awstats/APKBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=awstats -pkgver=6.95 -pkgrel=0 -pkgdesc="AWStats is short for Advanced Web Statistics." -url="http://awstats.sourceforge.net/" -license="GPL-2" -depends="perl perl-uri" -subpackages="$pkgname-doc" -source="http://awstats.sourceforge.net/files/$pkgname-$pkgver.tar.gz" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - local file - cd "$_builddir" - for file in tools/* wwwroot/cgi-bin/*; do - [ -f "${file}" ] || continue - sed -e "s:/usr/local/awstats/wwwroot:/usr/lib/awstats:g" \ - -i "$file" - done -} - -build() { - return 0 -} - -package() { - cd "$_builddir" -# logpath="awstats_log" -# sed -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \ -# -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" -# -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" -# -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin\"|" -# -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" -# if use ipv6; then -# sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" -# fi - - install -d "$pkgdir"/usr/share/doc/awstats \ - "$pkgdir"/var/lib/awstats \ - "$pkgdir"/usr/lib/awstats \ - "$pkgdir"/usr/bin \ - "$pkgdir"/etc/awstats - # docs - cp -a docs tools/xslt "$pkgdir"/usr/share/doc/awstats || return 1 - - # cgi-bin - cp -a wwwroot/* "$pkgdir"/usr/lib/awstats - mv "$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf \ - "$pkgdir"/etc/awstats/ - ln -s /etc/aswtats/awstats \ - "$pkgdir"/usr/lib/awstats/cgi-bin/awstats.model.conf - - # tools - cp tools/*.pl "$pkgdir"/usr/bin/ || return 1 - ln -s /usr/lib/awstats/cgi-bin/awstats.pl "$pkgdir"/usr/bin/ -} -md5sums="26a5b19fa9f395e9e7dafed37b795d7f awstats-6.95.tar.gz" -- cgit v1.2.3 From 35bae381d202f379dbe4fc6c9b187884764fdcfd Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 16 Jul 2010 14:17:28 +0000 Subject: testing/sqstat: new aport SqStat is a script which allows to look through active squid users connections http://samm.kiev.ua/sqstat/ --- testing/sqstat/APKBUILD | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 testing/sqstat/APKBUILD (limited to 'testing') diff --git a/testing/sqstat/APKBUILD b/testing/sqstat/APKBUILD new file mode 100644 index 0000000000..d40862eaf8 --- /dev/null +++ b/testing/sqstat/APKBUILD @@ -0,0 +1,34 @@ +# Maintainer: Natanael Copa +pkgname=sqstat +pkgver=1.20 +pkgrel=0 +pkgdesc="SqStat is a script which allows to look through active squid users connections" +url="http://samm.kiev.ua/sqstat/" +license="ISC" +depends= +makedepends= +install= +subpackages= +source="http://samm.kiev.ua/sqstat/sqstat-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" +} + +package() { + cd "$_builddir" + mkdir -p "$pkgdir"/usr/share/webapps/sqstat \ + "$pkgdir"/etc/sqstat + cp config.inc.php.defaults "$pkgdir"/etc/sqstat/config.inc.php + mv * "$pkgdir"/usr/share/webapps/sqstat/ + ln -s /etc/sqstat/config.inc.php \ + "$pkgdir"/usr/share/webapps/sqstat/config.inc.php +} + +md5sums="2b038a72eb5816995c3d7218ca516f30 sqstat-1.20.tar.gz" -- cgit v1.2.3 From 32441b10eaf9c5e6f7314af040cd557256b1d2da Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 16 Jul 2010 14:24:53 +0000 Subject: main/fuse: moved from testing --- testing/fuse/APKBUILD | 62 ------------------------------------------- testing/fuse/fuse-iconv.patch | 24 ----------------- testing/fuse/fuse.initd | 35 ------------------------ 3 files changed, 121 deletions(-) delete mode 100644 testing/fuse/APKBUILD delete mode 100644 testing/fuse/fuse-iconv.patch delete mode 100644 testing/fuse/fuse.initd (limited to 'testing') diff --git a/testing/fuse/APKBUILD b/testing/fuse/APKBUILD deleted file mode 100644 index 5f2d4eb61e..0000000000 --- a/testing/fuse/APKBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=fuse -pkgver=2.8.1 -pkgrel=1 -pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." -url="http://fuse.sourceforge.net/" -license="GPL2" -depends= -makedepends="pkgconfig libiconv-dev gettext-dev - autoconf automake libtool" -install= -subpackages="$pkgname-dev" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - fuse-iconv.patch - fuse.initd" - - -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" - patch -p1 -i "$srcdir"/fuse-iconv.patch || return 1 - aclocal -I m4 && libtoolize && autoconf && automake -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --enable-lib \ - --enable-util \ - --bindir=/bin \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 - - rm -rf "$pkgdir"/dev - rm -rf "$pkgdir"/etc/init.d - - install -Dm755 "$srcdir"/fuse.initd "$pkgdir"/etc/init.d/fuse - # create config - install -d "$pkgdir"/etc - cat >"$pkgdir"/etc/fuse.conf << _EOF_ -# Set the maximum number of FUSE mounts allowed to non-root users. -# The default is 1000. -# -#mount_max = 1000 - -# Allow non-root users to specify the 'allow_other' or 'allow_root' -# mount options. -# -#user_allow_other -_EOF_ - -} - -md5sums="0e3505ce90155983f1bc995eb2cf6fa7 fuse-2.8.1.tar.gz -e5183506aabc5bf7795da52953d38888 fuse-iconv.patch -5983726cfabf0830dffbbbf9a3abcddc fuse.initd" diff --git a/testing/fuse/fuse-iconv.patch b/testing/fuse/fuse-iconv.patch deleted file mode 100644 index 4710f576f2..0000000000 --- a/testing/fuse/fuse-iconv.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 3eec119..c7414ac 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -11,8 +11,10 @@ else - mount_source = mount.c mount_util.c mount_util.h - endif - -+libfuse_la_LDFLAGS = - if ICONV - iconv_source = modules/iconv.c -+libfuse_la_LDFLAGS += -liconv - else - iconv_source = - endif -@@ -35,7 +37,7 @@ libfuse_la_SOURCES = \ - $(iconv_source) \ - $(mount_source) - --libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:1 \ -+libfuse_la_LDFLAGS += @libfuse_libs@ -version-number 2:8:1 \ - -Wl,--version-script,$(srcdir)/fuse_versionscript - - libulockmgr_la_SOURCES = ulockmgr.c diff --git a/testing/fuse/fuse.initd b/testing/fuse/fuse.initd deleted file mode 100644 index 30b512e8dc..0000000000 --- a/testing/fuse/fuse.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -MOUNTPOINT=/sys/fs/fuse/connections - -depend() { - need localmount -} - -start() { - - ebegin "Starting fuse" - if ! grep -qw fuse /proc/filesystems; then - modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module" - fi - if grep -qw fusectl /proc/filesystems && \ - ! grep -qw $MOUNTPOINT /proc/mounts; then - mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \ - eerror $? "Error mounting control filesystem" - fi - eend ${?} - -} - -stop() { - - ebegin "Stopping fuse" - if grep -qw $MOUNTPOINT /proc/mounts; then - umount $MOUNTPOINT >/dev/null 2>&1 || \ - eerror $? "Error unmounting control filesystem" - fi - eend ${?} - -} -- cgit v1.2.3 From bcebf7b2dd8a48c9c230fc38b7a737a103b124a9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 17 Jul 2010 17:42:31 +0000 Subject: main/mrtg: moved from testing --- testing/mrtg/APKBUILD | 34 ------------------------------- testing/mrtg/mrtg.confd | 17 ---------------- testing/mrtg/mrtg.initd | 53 ------------------------------------------------- 3 files changed, 104 deletions(-) delete mode 100644 testing/mrtg/APKBUILD delete mode 100644 testing/mrtg/mrtg.confd delete mode 100644 testing/mrtg/mrtg.initd (limited to 'testing') diff --git a/testing/mrtg/APKBUILD b/testing/mrtg/APKBUILD deleted file mode 100644 index 9334db7a47..0000000000 --- a/testing/mrtg/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: Jeff Bilyk -# Maintainer: Natanael Copa -pkgname=mrtg -pkgver=2.16.4 -pkgrel=1 -pkgdesc="MRTG Network Latency Monitoring" -url="http://oss.oetiker.ch/mrtg/" -source="http://oss.oetiker.ch/mrtg/pub/$pkgname-$pkgver.tar.gz - mrtg.initd mrtg.confd" -subpackages="$pkgname-doc" -depends="perl" -makedepends="gd-dev libpng-dev zlib-dev" -license="GPL" - -_builddir="$srcdir"/$pkgname-$pkgver - -build() { - cd "$_builddir" - ./configure --bindir=/usr/bin \ - --libdir=/usr/lib \ - --datadir=/usr/share/doc \ - --mandir=/usr/share/doc/man \ - || return 1 - make -} - -package() { - cd "$_builddir" - make install DESTDIR="$pkgdir" -} - -md5sums="ec298200d239832ff1648fba488e1a9e mrtg-2.16.4.tar.gz -47053d5e51ac8eefe3807d5168219f78 mrtg.initd -a8d246d324b90fd1e37cc912d4651372 mrtg.confd" diff --git a/testing/mrtg/mrtg.confd b/testing/mrtg/mrtg.confd deleted file mode 100644 index f3be157baf..0000000000 --- a/testing/mrtg/mrtg.confd +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1 2005/01/26 10:35:05 ka0ttic Exp $ - -MRTG_CONF="/etc/mrtg.conf" -MRTG_PID="/var/run/mrtg.pid" - -# uncomment and set the following, if you'd like to run mrtg as a -# different user/group -#MRTG_USER="" -#MRTG_GROUP="" - -# uncomment if you'd like to enable logging -#MRTG_LOG="/var/log/mrtg.log" - -# set any extra options here -MRTG_OPTS="" diff --git a/testing/mrtg/mrtg.initd b/testing/mrtg/mrtg.initd deleted file mode 100644 index 31adb2cf0a..0000000000 --- a/testing/mrtg/mrtg.initd +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.7 2007/04/19 19:08:08 cedk Exp $ - -depend() { - need net - - # if monitoring snmp variables on this machine: - # use net-snmpd -} - -checkconfig() { - if ! [ -f "${MRTG_CONF} ]; then - eerror "Please create ${MRTG_CONF} (try man cfgmaker)" - return 1 - fi - - mrtg --check ${MRTG_CONF} - return $? -} - -start() { - # mrtg will not run if LANG=*utf8 - # use grep instead of bash regexp for bug #159786 - echo $LANG | grep -q -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$' && LANG='C' - - checkconfig || return $? - - # enable logging? - [ -n "${MRTG_LOG}" ] && \ - MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}" - - # run as a different user? - [ -n "${MRTG_USER}" ] && \ - MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}" - - # run as a different group? - [ -n "${MRTG_GROUP}" ] && \ - MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}" - - ebegin "Starting mrtg" - start-stop-daemon --start --quiet --pidfile ${MRTG_PID} --name mrtg\ - --exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \ - ${MRTG_OPTS} ${MRTG_CONF} >/dev/null - eend $? "Failed to start mrtg" -} - -stop() { - ebegin "Stopping mrtg" - start-stop-daemon --stop --quiet --pidfile ${MRTG_PID} - eend $? "Failed to stop mrtg" -} -- cgit v1.2.3 From 60937c3d088fb999e9a95999e0420af7229ecef3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 17 Jul 2010 19:44:27 +0000 Subject: testing/recordmydesktop: new aport Produces a OGG encapsulated Theora/Vorbis recording of your desktop http://recordmydesktop.sourceforge.net --- testing/recordmydesktop/APKBUILD | 37 ++++++++++++++++ .../recordmydesktop/recordmydesktop-bitrate.patch | 50 ++++++++++++++++++++++ testing/recordmydesktop/shmstr-to-shmproto.patch | 20 +++++++++ 3 files changed, 107 insertions(+) create mode 100644 testing/recordmydesktop/APKBUILD create mode 100644 testing/recordmydesktop/recordmydesktop-bitrate.patch create mode 100644 testing/recordmydesktop/shmstr-to-shmproto.patch (limited to 'testing') diff --git a/testing/recordmydesktop/APKBUILD b/testing/recordmydesktop/APKBUILD new file mode 100644 index 0000000000..838292f627 --- /dev/null +++ b/testing/recordmydesktop/APKBUILD @@ -0,0 +1,37 @@ +# Maintainer: Natanael Copa +pkgname=recordmydesktop +pkgver=0.3.8.1 +pkgrel=0 +pkgdesc="Produces a OGG encapsulated Theora/Vorbis recording of your desktop" +url="http://recordmydesktop.sourceforge.net" +license="GPL" +depends="" +makedepends="alsa-lib-dev zlib-dev libvorbis-dev libxdamage-dev libxext-dev + libtheora-dev libsm-dev" +subpackages="$pkgname-doc" +source="http://downloads.sourceforge.net/recordmydesktop/recordmydesktop-$pkgver.tar.gz + shmstr-to-shmproto.patch + recordmydesktop-bitrate.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -p0 < $srcdir/shmstr-to-shmproto.patch + patch -p1 < $srcdir/recordmydesktop-bitrate.patch +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --disable-jack \ + || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="6998b165540598965499bd99d8aa0eef recordmydesktop-0.3.8.1.tar.gz +211a1773f223b3f281520aa1056395e6 shmstr-to-shmproto.patch +b0794a769efd287e9e8c5fb8c3299b35 recordmydesktop-bitrate.patch" diff --git a/testing/recordmydesktop/recordmydesktop-bitrate.patch b/testing/recordmydesktop/recordmydesktop-bitrate.patch new file mode 100644 index 0000000000..9b014486af --- /dev/null +++ b/testing/recordmydesktop/recordmydesktop-bitrate.patch @@ -0,0 +1,50 @@ +diff -ru recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c recordmydesktop-0.3.8.1/src/rmd_initialize_data.c +--- recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500 ++++ recordmydesktop-0.3.8.1/src/rmd_initialize_data.c 2009-11-25 09:28:07.629507987 -0500 +@@ -224,7 +224,7 @@ + args->channels = 1; + args->frequency = 22050; + args->buffsize = 4096; +- args->v_bitrate = 45000; ++ args->v_bitrate = 0; + args->v_quality = 63; + args->s_quality = 10; + +diff -ru recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c recordmydesktop-0.3.8.1/src/rmd_parseargs.c +--- recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500 ++++ recordmydesktop-0.3.8.1/src/rmd_parseargs.c 2009-11-25 09:39:32.786757292 -0500 +@@ -104,10 +104,10 @@ + "Encoding Options\n" + "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n" + "\t--v_quality n\t\tA number from 0 to 63 for" +- " desired encoded video quality(default 63).\n" ++ " desired encoded video quality(default 63).\n\t (set quality to zero for bitrate controlled usage)\n" + +- "\t--v_bitrate n\t\tA number from 45000 to 2000000" +- " for desired encoded video bitrate(default 45000).\n" ++ "\t--v_bitrate n\t\tA number from 0 to 200000000" ++ " for desired encoded video bitrate(default 0 = not rate controlled).\n" + + "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n\n" + +@@ -327,17 +327,17 @@ + strcmp(argv[i], "-v_bitrate") == 0) { + if(i+1=45000)&&(num<=2000000)) ++ if((num>=0)&&(num<=200000000)) + arg_return->v_bitrate=num; + else{ + fprintf(stderr,"Argument Usage:" +- " --v_bitrate n(number 45000-2000000)\n"); ++ " --v_bitrate n(number 0-200000000)\n"); + return FALSE; + } + } + else{ + fprintf(stderr,"Argument Usage:" +- " --v_bitrate n(number 45000-2000000)\n"); ++ " --v_bitrate n(number 0-200000000)\n"); + return FALSE; + } + i++; diff --git a/testing/recordmydesktop/shmstr-to-shmproto.patch b/testing/recordmydesktop/shmstr-to-shmproto.patch new file mode 100644 index 0000000000..6fc446e9a8 --- /dev/null +++ b/testing/recordmydesktop/shmstr-to-shmproto.patch @@ -0,0 +1,20 @@ +--- src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 ++++ src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 +@@ -32,7 +32,7 @@ + + #include + #include +-#include ++#include + #include + + +--- src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 ++++ src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 +@@ -32,7 +32,7 @@ + #include "rmd_types.h" + + #include +-#include ++#include + #include -- cgit v1.2.3 From b1ab67635f5d706a1c45d673e37b90de2b77aa8b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 17 Jul 2010 20:15:34 +0000 Subject: testing/xwininfo: new aport Window information utility for X http://cgit.freedesktop.org/xorg/app/xwininfo/ --- testing/xwininfo/APKBUILD | 33 + ...tml?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab | 2536 ++++++++++++++++++++ 2 files changed, 2569 insertions(+) create mode 100644 testing/xwininfo/APKBUILD create mode 100644 testing/xwininfo/index.html?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab (limited to 'testing') diff --git a/testing/xwininfo/APKBUILD b/testing/xwininfo/APKBUILD new file mode 100644 index 0000000000..4755ff9cd7 --- /dev/null +++ b/testing/xwininfo/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: Natanael Copa +pkgname=xwininfo +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Window information utility for X" +url="http://cgit.freedesktop.org/xorg/app/xwininfo/" +license="GPL" +depends= +makedepends="libx11-dev libxext-dev" +install= +subpackages="$pkgname-doc" +source="http://xorg.freedesktop.org/releases/individual/app/xwininfo-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="908f8bc3255f639effa9780fb1c19ea4 xwininfo-1.0.5.tar.bz2" diff --git a/testing/xwininfo/index.html?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab b/testing/xwininfo/index.html?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab new file mode 100644 index 0000000000..35c007c4f4 --- /dev/null +++ b/testing/xwininfo/index.html?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab @@ -0,0 +1,2536 @@ +From 96f19bade9ce4940642d580f4c52e2bc0e3539ab Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sun, 13 Jun 2010 19:42:34 +0000 +Subject: Convert from Xlib to xcb + +Testing was done with a simple GNOME 2.28 session with a number of +applications open (gnome-terminal, VirtualBox, Firefox). + +Primary test case was xwininfo -root -all, which listed 114 children of +the root window. Output was identical to Xlib version (after applying +the fix to libxcb_icccm for always null-terminating wm_class properties). + +Over a local connection on the same machine: + +Xlib: 0.00u 0.01s 0:00.05 20.0% +xcb: 0.00u 0.00s 0:00.02 0.0% + +(i.e. barely measurable difference - I had more variation between + repeated runs of the command) + +Introducing latency by running over ssh -X from California to Beijing +and back: + +Xlib: 0.03u 0.02s 8:19.12 0.0% +xcb: 0.00u 0.00s 0:45.26 0.0% + +Memory size when exit() is called: + +Xlib: + Address Kbytes RSS Anon Locked Mode Mapped File +08043000 20 20 20 - rw--- [ stack ] +08400000 144 144 144 - rw--- [ heap ] +total Kb 8972 8640 316 - + +xcb: + Address Kbytes RSS Anon Locked Mode Mapped File +08045000 12 12 12 - rwx-- [ stack ] +0806C000 100 100 100 - rwx-- [ heap ] +total Kb 7980 7692 288 - + +Bytes sent & received (counted by proxying via xscope): + +Xlib: Client --> Server: 21380 bytes Client <-- Server: 54124 bytes +xcb: Client --> Server: 21114 bytes Client <-- Server: 53160 bytes + +(The Xlib code didn't save any replies, so re-requested a couple of things + when running with -all - I fixed that while porting to xcb, but the same + could be done with Xlib easily too.) + +Not yet handled: WM_NAME properties that need to be converted from another +character encoding. + +Signed-off-by: Alan Coopersmith +Reviewed-by: James Cloos +--- +diff --git a/COPYING b/COPYING +index 10b416d..687540f 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,4 +1,4 @@ +-Copyright © 1999 Sun Microsystems, Inc. All rights reserved. ++Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), +diff --git a/clientwin.c b/clientwin.c +index cce35ad..fe6bd18 100644 +--- a/clientwin.c ++++ b/clientwin.c +@@ -19,47 +19,59 @@ + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ +-#include +-#include ++#include ++#include ++ ++#include ++#include + + #include "clientwin.h" + +-static Atom atom_wm_state = None; ++static xcb_atom_t atom_wm_state = XCB_ATOM_NONE; ++typedef enum { False = 0, True } Bool; + + /* + * Check if window has given property + */ + static Bool +-Window_Has_Property(Display * dpy, Window win, Atom atom) ++Window_Has_Property(xcb_connection_t * dpy, xcb_window_t win, xcb_atom_t atom) + { +- Atom type_ret; +- int format_ret; +- unsigned char *prop_ret; +- unsigned long bytes_after, num_ret; +- +- type_ret = None; +- prop_ret = NULL; +- XGetWindowProperty(dpy, win, atom, 0, 0, False, AnyPropertyType, +- &type_ret, &format_ret, &num_ret, +- &bytes_after, &prop_ret); +- if (prop_ret) +- XFree(prop_ret); +- +- return (type_ret != None) ? True : False; ++ xcb_get_property_cookie_t prop_cookie; ++ xcb_get_property_reply_t *prop_reply; ++ ++ prop_cookie = xcb_get_property (dpy, False, win, atom, ++ XCB_GET_PROPERTY_TYPE_ANY, 0, 0); ++ ++ prop_reply = xcb_get_property_reply (dpy, prop_cookie, NULL); ++ ++ if (prop_reply) { ++ xcb_atom_t reply_type = prop_reply->type; ++ free (prop_reply); ++ if (reply_type != XCB_NONE) ++ return True; ++ } ++ ++ return False; + } + + /* + * Check if window is viewable + */ + static Bool +-Window_Is_Viewable(Display * dpy, Window win) ++Window_Is_Viewable(xcb_connection_t * dpy, xcb_window_t win) + { +- Bool ok; +- XWindowAttributes xwa; ++ Bool ok = False; ++ xcb_get_window_attributes_cookie_t attr_cookie; ++ xcb_get_window_attributes_reply_t *xwa; + +- XGetWindowAttributes(dpy, win, &xwa); ++ attr_cookie = xcb_get_window_attributes (dpy, win); ++ xwa = xcb_get_window_attributes_reply (dpy, attr_cookie, NULL); + +- ok = (xwa.class == InputOutput) && (xwa.map_state == IsViewable); ++ if (xwa) { ++ ok = (xwa->_class == XCB_WINDOW_CLASS_INPUT_OUTPUT) && ++ (xwa->map_state == XCB_MAP_STATE_VIEWABLE); ++ free (xwa); ++ } + + return ok; + } +@@ -70,24 +82,32 @@ Window_Is_Viewable(Display * dpy, Window win) + * Children are searched in top-down stacking order. + * The first matching window is returned, None if no match is found. + */ +-static Window +-Find_Client_In_Children(Display * dpy, Window win) ++static xcb_window_t ++Find_Client_In_Children(xcb_connection_t * dpy, xcb_window_t win) + { +- Window root, parent; +- Window *children; ++ xcb_query_tree_cookie_t qt_cookie; ++ xcb_query_tree_reply_t *tree; ++ xcb_window_t *children; + unsigned int n_children; + int i; + +- if (!XQueryTree(dpy, win, &root, &parent, &children, &n_children)) +- return None; +- if (!children) +- return None; ++ qt_cookie = xcb_query_tree (dpy, win); ++ tree = xcb_query_tree_reply (dpy, qt_cookie, NULL); ++ if (!tree) ++ return XCB_WINDOW_NONE; ++ n_children = xcb_query_tree_children_length (tree); ++ if (!n_children) { ++ free (tree); ++ return XCB_WINDOW_NONE; ++ } ++ children = xcb_query_tree_children (tree); + + /* Check each child for WM_STATE and other validity */ +- win = None; ++ win = XCB_WINDOW_NONE; + for (i = (int) n_children - 1; i >= 0; i--) { + if (!Window_Is_Viewable(dpy, children[i])) { +- children[i] = None; /* Don't bother descending into this one */ ++ /* Don't bother descending into this one */ ++ children[i] = XCB_WINDOW_NONE; + continue; + } + if (!Window_Has_Property(dpy, children[i], atom_wm_state)) +@@ -100,15 +120,15 @@ Find_Client_In_Children(Display * dpy, Window win) + + /* No children matched, now descend into each child */ + for (i = (int) n_children - 1; i >= 0; i--) { +- if (children[i] == None) ++ if (children[i] == XCB_WINDOW_NONE) + continue; + win = Find_Client_In_Children(dpy, children[i]); +- if (win != None) ++ if (win != XCB_WINDOW_NONE) + break; + } + + done: +- XFree(children); ++ free (tree); /* includes children */ + + return win; + } +@@ -116,49 +136,68 @@ Find_Client_In_Children(Display * dpy, Window win) + /* + * Find virtual roots (_NET_VIRTUAL_ROOTS) + */ +-static unsigned long * +-Find_Roots(Display * dpy, Window root, unsigned int *num) ++static xcb_window_t * ++Find_Roots(xcb_connection_t * dpy, xcb_window_t root, unsigned int *num) + { +- Atom type_ret; +- int format_ret; +- unsigned char *prop_ret; +- unsigned long bytes_after, num_ret; +- Atom atom; ++ xcb_atom_t atom = XCB_ATOM_NONE; ++ xcb_intern_atom_cookie_t atom_cookie; ++ xcb_intern_atom_reply_t *atom_reply; ++ ++ xcb_get_property_cookie_t prop_cookie; ++ xcb_get_property_reply_t *prop_reply; ++ ++ xcb_window_t *prop_ret = NULL; + + *num = 0; +- atom = XInternAtom(dpy, "_NET_VIRTUAL_ROOTS", False); ++ ++ atom_cookie = xcb_intern_atom (dpy, False, strlen("_NET_VIRTUAL_ROOTS"), ++ "_NET_VIRTUAL_ROOTS"); ++ atom_reply = xcb_intern_atom_reply (dpy, atom_cookie, NULL); ++ if (atom_reply) { ++ atom = atom_reply->atom; ++ free (atom_reply); ++ } + if (!atom) + return NULL; + +- type_ret = None; +- prop_ret = NULL; +- if (XGetWindowProperty(dpy, root, atom, 0, 0x7fffffff, False, +- XA_WINDOW, &type_ret, &format_ret, &num_ret, +- &bytes_after, &prop_ret) != Success) ++ prop_cookie = xcb_get_property (dpy, False, root, atom, XCB_ATOM_WINDOW, ++ 0, 0x7fffffff); ++ prop_reply = xcb_get_property_reply (dpy, prop_cookie, NULL); ++ if (!prop_reply) + return NULL; + +- if (prop_ret && type_ret == XA_WINDOW && format_ret == 32) { +- *num = num_ret; +- return ((unsigned long *) prop_ret); ++ if ((prop_reply->value_len > 0) && (prop_reply->type == XCB_ATOM_WINDOW) ++ && (prop_reply->format == 32)) { ++ int length = xcb_get_property_value_length (prop_reply); ++ prop_ret = malloc(length); ++ if (prop_ret) { ++ memcpy (prop_ret, xcb_get_property_value(prop_reply), length); ++ *num = prop_reply->value_len; ++ } + } +- if (prop_ret) +- XFree(prop_ret); ++ free (prop_reply); + +- return NULL; ++ return prop_ret; + } + + /* + * Find child window at pointer location + */ +-static Window +-Find_Child_At_Pointer(Display * dpy, Window win) ++static xcb_window_t ++Find_Child_At_Pointer(xcb_connection_t * dpy, xcb_window_t win) + { +- Window root_return, child_return; +- int dummyi; +- unsigned int dummyu; ++ xcb_window_t child_return = XCB_WINDOW_NONE; ++ ++ xcb_query_pointer_cookie_t qp_cookie; ++ xcb_query_pointer_reply_t *qp_reply; + +- XQueryPointer(dpy, win, &root_return, &child_return, +- &dummyi, &dummyi, &dummyi, &dummyi, &dummyu); ++ qp_cookie = xcb_query_pointer (dpy, win); ++ qp_reply = xcb_query_pointer_reply (dpy, qp_cookie, NULL); ++ ++ if (qp_reply) { ++ child_return = qp_reply->child; ++ free (qp_reply); ++ } + + return child_return; + } +@@ -175,12 +214,12 @@ Find_Child_At_Pointer(Display * dpy, Window win) + * This will of course work only if the virtual roots are children of the real + * root. + */ +-Window +-Find_Client(Display * dpy, Window root, Window subwin) ++xcb_window_t ++Find_Client(xcb_connection_t * dpy, xcb_window_t root, xcb_window_t subwin) + { +- unsigned long *roots; ++ xcb_window_t *roots; + unsigned int i, n_roots; +- Window win; ++ xcb_window_t win; + + /* Check if subwin is a virtual root */ + roots = Find_Roots(dpy, root, &n_roots); +@@ -188,16 +227,24 @@ Find_Client(Display * dpy, Window root, Window subwin) + if (subwin != roots[i]) + continue; + win = Find_Child_At_Pointer(dpy, subwin); +- if (win == None) ++ if (win == XCB_WINDOW_NONE) + return subwin; /* No child - Return virtual root. */ + subwin = win; + break; + } +- if (roots) +- XFree(roots); ++ free (roots); + +- if (atom_wm_state == None) { +- atom_wm_state = XInternAtom(dpy, "WM_STATE", False); ++ if (atom_wm_state == XCB_ATOM_NONE) { ++ xcb_intern_atom_cookie_t atom_cookie; ++ xcb_intern_atom_reply_t *atom_reply; ++ ++ atom_cookie = xcb_intern_atom (dpy, False, ++ strlen("WM_STATE"), "WM_STATE"); ++ atom_reply = xcb_intern_atom_reply (dpy, atom_cookie, NULL); ++ if (atom_reply) { ++ atom_wm_state = atom_reply->atom; ++ free (atom_reply); ++ } + if (!atom_wm_state) + return subwin; + } +@@ -208,7 +255,7 @@ Find_Client(Display * dpy, Window root, Window subwin) + + /* Attempt to find a client window in subwin's children */ + win = Find_Client_In_Children(dpy, subwin); +- if (win != None) ++ if (win != XCB_WINDOW_NONE) + return win; /* Found a client */ + + /* Did not find a client */ +diff --git a/clientwin.h b/clientwin.h +index 9fc59b5..05aa202 100644 +--- a/clientwin.h ++++ b/clientwin.h +@@ -22,8 +22,10 @@ + #ifndef _CLIENTWIN_H_ + #define _CLIENTWIN_H_ + +-#include ++#include ++#include + +-extern Window Find_Client(Display * dpy, Window root, Window target_win); ++extern xcb_window_t Find_Client(xcb_connection_t * dpy, xcb_window_t root, ++ xcb_window_t target_win); + + #endif +diff --git a/configure.ac b/configure.ac +index 7ef640a..3337c6c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,8 +41,10 @@ XORG_DEFAULT_OPTIONS + AC_CHECK_FUNCS([strlcat]) + + # Checks for pkg-config packages +-PKG_CHECK_MODULES(XWININFO, xext x11 [xproto >= 7.0.17]) +-AC_SUBST(XWININFO_CFLAGS) +-AC_SUBST(XWININFO_LIBS) ++PKG_CHECK_MODULES(XWININFO, [xcb >= 1.6] xcb-icccm xcb-shape) ++# Even when using xcb, xproto is still required for Xfuncproto.h ++# and libX11 headers for cursorfont.h ++PKG_CHECK_MODULES(XLIB, x11 [xproto >= 7.0.17]) ++XWININFO_CFLAGS="${XWININFO_CFLAGS} ${XLIB_CFLAGS}" + + AC_OUTPUT([Makefile]) +diff --git a/dsimple.c b/dsimple.c +index 51df01f..d1accf7 100644 +--- a/dsimple.c ++++ b/dsimple.c +@@ -1,4 +1,26 @@ + /* ++ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ */ ++/* + + Copyright 1993, 1998 The Open Group + +@@ -26,19 +48,14 @@ from The Open Group. + + */ + +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + #include + #include +-/* +- * Other_stuff.h: Definitions of routines in other_stuff. +- * +- * Written by Mark Lillibridge. Last updated 7/1/87 +- */ +- ++#include + #include "clientwin.h" + #include "dsimple.h" + +@@ -46,72 +63,33 @@ from The Open Group. + * Just_display: A group of routines designed to make the writing of simple + * X11 applications which open a display but do not open + * any windows much faster and easier. Unless a routine says +- * otherwise, it may be assumed to require program_name, dpy, +- * and screen already defined on entry. ++ * otherwise, it may be assumed to require program_name ++ * to be already defined on entry. + * + * Written by Mark Lillibridge. Last updated 7/1/87 + */ + + +-/* This stuff is defined in the calling program by just_display.h */ ++/* This stuff is defined in the calling program by dsimple.h */ + char *program_name = "unknown_program"; +-Display *dpy = NULL; +-int screen = 0; +- + + /* +- * Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete) +- * If found, remove it from command line. Don't go past a lone -. ++ * Get_Display_Name (argc, argv) - return string representing display name ++ * that would be used given the specified argument (i.e. if it's NULL, check ++ * getenv("DISPLAY") - always returns a non-NULL pointer, though it may be ++ * an unwritable constant, so is safe to printf() on platforms that crash ++ * on NULL printf arguments. + */ +-char *Get_Display_Name ( +- int *pargc, /* MODIFIED */ +- char **argv) /* MODIFIED */ ++const char *Get_Display_Name (const char *display_name) + { +- int argc = *pargc; +- char **pargv = argv+1; +- char *displayname = NULL; +- int i; +- +- for (i = 1; i < argc; i++) { +- char *arg = argv[i]; +- +- if (!strcmp (arg, "-display") || !strcmp (arg, "-d")) { +- if (++i >= argc) usage (); ++ const char *name = display_name; + +- displayname = argv[i]; +- *pargc -= 2; +- continue; +- } +- if (!strcmp (arg,"-")) { +- while (i Selects window with id . may +- * be either in decimal or hex. +- * -name Selects the window with name . +- * +- * Call as Select_Window_Args(&argc, argv) in main before +- * parsing any of your program's command line arguments. +- * Select_Window_Args will remove its arguments so that +- * your program does not have to worry about them. +- * The window returned is the window selected or 0 if +- * none of the above arguments was present. If 0 is +- * returned, Select_Window should probably be called after +- * all command line arguments, and other setup is done. +- * For examples of usage, see xwininfo, xwd, or xprop. ++ * xcb equivalent of XCreateFontCursor + */ +-Window Select_Window_Args ( +- int *rargc, +- char **argv) +-#define ARGC (*rargc) ++static xcb_cursor_t ++Create_Font_Cursor (xcb_connection_t *dpy, uint16_t glyph) + { +- int nargc = 1; +- int argc; +- char **nargv; +- Window w = 0; +- +- nargv = argv+1; argc = ARGC; +-#define OPTION argv[0] +-#define NXTOPTP ++argv, --argc>0 +-#define NXTOPT if (++argv, --argc==0) usage() +-#define COPYOPT nargv++[0]=OPTION, nargc++ +- +- while (NXTOPTP) { +- if (!strcmp (OPTION, "-")) { +- COPYOPT; +- while (NXTOPTP) +- COPYOPT; +- break; +- } +- if (!strcmp (OPTION, "-root")) { +- w = RootWindow (dpy, screen); +- continue; +- } +- if (!strcmp (OPTION, "-name")) { +- NXTOPT; +- w = Window_With_Name (dpy, RootWindow (dpy, screen), OPTION); +- if (!w) +- Fatal_Error ("No window with name %s exists!", OPTION); +- continue; +- } +- if (!strcmp (OPTION, "-id")) { +- NXTOPT; +- w = 0; +- sscanf (OPTION, "0x%lx", &w); +- if (!w) +- sscanf (OPTION, "%lu", &w); +- if (!w) +- Fatal_Error ("Invalid window id format: %s.", OPTION); +- continue; +- } +- COPYOPT; +- } +- ARGC = nargc; ++ static xcb_font_t cursor_font; ++ xcb_cursor_t cursor; + +- return (w); +-} ++ if (!cursor_font) { ++ cursor_font = xcb_generate_id (dpy); ++ xcb_open_font (dpy, cursor_font, strlen ("cursor"), "cursor"); ++ } + +-/* +- * Other_stuff: A group of routines which do common X11 tasks. +- * +- * Written by Mark Lillibridge. Last updated 7/1/87 +- */ ++ cursor = xcb_generate_id (dpy); ++ xcb_create_glyph_cursor (dpy, cursor, cursor_font, cursor_font, ++ glyph, glyph + 1, ++ 0, 0, 0, 0xffff, 0xffff, 0xffff); /* rgb, rgb */ + ++ return cursor; ++} + + /* + * Routine to let user select a window using the mouse + */ + +-Window Select_Window (Display *dpy, int descend) ++xcb_window_t Select_Window(xcb_connection_t *dpy, ++ const xcb_screen_t *screen, ++ int descend) + { +- int status; +- Cursor cursor; +- XEvent event; +- Window target_win = None, root = RootWindow (dpy,screen); ++ xcb_cursor_t cursor; ++ xcb_generic_event_t *event; ++ xcb_window_t target_win = XCB_WINDOW_NONE; ++ xcb_window_t root = screen->root; + int buttons = 0; ++ xcb_generic_error_t *err; ++ xcb_grab_pointer_cookie_t grab_cookie; ++ xcb_grab_pointer_reply_t *grab_reply; + + /* Make the target cursor */ +- cursor = XCreateFontCursor (dpy, XC_crosshair); ++ cursor = Create_Font_Cursor (dpy, XC_crosshair); + + /* Grab the pointer using target cursor, letting it room all over */ +- status = XGrabPointer (dpy, root, False, +- ButtonPressMask|ButtonReleaseMask, GrabModeSync, +- GrabModeAsync, root, cursor, CurrentTime); +- if (status != GrabSuccess) Fatal_Error ("Can't grab the mouse."); ++ grab_cookie = xcb_grab_pointer ++ (dpy, False, root, ++ XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE, ++ XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, ++ root, cursor, XCB_TIME_CURRENT_TIME); ++ grab_reply = xcb_grab_pointer_reply (dpy, grab_cookie, &err); ++ if (grab_reply->status != XCB_GRAB_STATUS_SUCCESS) ++ Fatal_Error ("Can't grab the mouse."); + + /* Let the user select a window... */ +- while ((target_win == None) || (buttons != 0)) { ++ while ((target_win == XCB_WINDOW_NONE) || (buttons != 0)) { + /* allow one more event */ +- XAllowEvents (dpy, SyncPointer, CurrentTime); +- XWindowEvent (dpy, root, ButtonPressMask|ButtonReleaseMask, &event); +- switch (event.type) { +- case ButtonPress: +- if (target_win == None) { +- target_win = event.xbutton.subwindow; /* window selected */ +- if (target_win == None) target_win = root; ++ xcb_allow_events (dpy, XCB_ALLOW_SYNC_POINTER, XCB_TIME_CURRENT_TIME); ++ xcb_flush (dpy); ++ event = xcb_wait_for_event (dpy); ++ switch (event->response_type & 0x7f) { ++ case XCB_BUTTON_PRESS: ++ { ++ xcb_button_press_event_t *bp = (xcb_button_press_event_t *)event; ++ ++ if (target_win == XCB_WINDOW_NONE) { ++ target_win = bp->child; /* window selected */ ++ if (target_win == XCB_WINDOW_NONE) ++ target_win = root; + } + buttons++; + break; +- case ButtonRelease: ++ } ++ case XCB_BUTTON_RELEASE: + if (buttons > 0) /* there may have been some down before we started */ + buttons--; + break; ++ default: ++ /* just discard all other events */ ++ break; + } ++ free (event); + } + +- XUngrabPointer (dpy, CurrentTime); /* Done with pointer */ ++ xcb_ungrab_pointer (dpy, XCB_TIME_CURRENT_TIME); /* Done with pointer */ + + if (!descend || (target_win == root)) + return (target_win); +@@ -285,36 +224,104 @@ Window Select_Window (Display *dpy, int descend) + * one found will be returned. Only top and its subwindows + * are looked at. Normally, top should be the RootWindow. + */ +-Window Window_With_Name ( +- Display *dpy, +- Window top, +- char *name) ++ ++struct wininfo_cookies { ++ xcb_get_property_cookie_t get_wm_name; ++ xcb_query_tree_cookie_t query_tree; ++}; ++ ++static xcb_window_t ++recursive_Window_With_Name ( ++ xcb_connection_t *dpy, ++ xcb_window_t window, ++ struct wininfo_cookies *cookies, ++ const char *name) + { +- Window *children, dummy; ++ xcb_window_t *children; + unsigned int nchildren; + int i; +- Window w=0; +- char *window_name; ++ xcb_window_t w = 0; ++ xcb_generic_error_t *err; ++ xcb_get_text_property_reply_t prop; ++ xcb_query_tree_reply_t *tree; ++ struct wininfo_cookies *child_cookies; ++ ++ if (xcb_get_wm_name_reply (dpy, cookies->get_wm_name, &prop, &err)) { ++ /* can't use strcmp, since prop.name is not null terminated */ ++ if (strncmp (prop.name, name, prop.name_len) == 0) { ++ w = window; ++ } ++ ++ xcb_get_text_property_reply_wipe (&prop); + +- if (XFetchName (dpy, top, &window_name) && !strcmp (window_name, name)) +- return (top); ++ if (w) ++ { ++ xcb_discard_reply (dpy, cookies->query_tree.sequence); ++ return w; ++ } ++ } else if (err) { ++ if (err->response_type == 0) ++ Print_X_Error (dpy, err); ++ return 0; ++ } + +- if (!XQueryTree (dpy, top, &dummy, &dummy, &children, &nchildren)) +- return (0); ++ tree = xcb_query_tree_reply (dpy, cookies->query_tree, &err); ++ if (!tree) { ++ if (err->response_type == 0) ++ Print_X_Error (dpy, err); ++ return 0; ++ } ++ ++ nchildren = xcb_query_tree_children_length (tree); ++ children = xcb_query_tree_children (tree); ++ child_cookies = calloc(nchildren, sizeof(struct wininfo_cookies)); ++ ++ if (child_cookies == NULL) ++ Fatal_Error("Failed to allocate memory in recursive_Window_With_Name"); ++ ++ for (i = 0; i < nchildren; i++) { ++ child_cookies[i].get_wm_name = xcb_get_wm_name (dpy, children[i]); ++ child_cookies[i].query_tree = xcb_query_tree (dpy, children[i]); ++ } ++ xcb_flush (dpy); + + for (i = 0; i < nchildren; i++) { +- w = Window_With_Name (dpy, children[i], name); ++ w = recursive_Window_With_Name (dpy, children[i], ++ &child_cookies[i], name); + if (w) + break; + } +- if (children) XFree ((char *)children); ++ ++ if (w) ++ { ++ /* clean up remaining replies */ ++ for (/* keep previous i */; i < nchildren; i++) { ++ xcb_discard_reply (dpy, child_cookies[i].get_wm_name.sequence); ++ xcb_discard_reply (dpy, child_cookies[i].query_tree.sequence); ++ } ++ } ++ ++ free (child_cookies); ++ free (tree); /* includes storage for children[] */ + return (w); + } + ++xcb_window_t ++Window_With_Name ( ++ xcb_connection_t *dpy, ++ xcb_window_t top, ++ const char *name) ++{ ++ struct wininfo_cookies cookies; ++ ++ cookies.get_wm_name = xcb_get_wm_name (dpy, top); ++ cookies.query_tree = xcb_query_tree (dpy, top); ++ return recursive_Window_With_Name(dpy, top, &cookies, name); ++} ++ + + /* + * Standard fatal error routine - call like printf +- * Does not require dpy or screen defined. + */ + void Fatal_Error (char *msg, ...) + { +@@ -326,6 +333,127 @@ void Fatal_Error (char *msg, ...) + vfprintf (stderr, msg, args); + va_end (args); + fprintf (stderr, "\n"); +- Close_Display (); + exit (EXIT_FAILURE); + } ++ ++/* ++ * Print X error information like the default Xlib error handler ++ */ ++void ++Print_X_Error ( ++ xcb_connection_t *dpy, ++ xcb_generic_error_t *err ++ ) ++{ ++ char buffer[256] = ""; ++ ++ if ((err == NULL) || (err->response_type != 0)) /* not an error */ ++ return; ++ ++ /* Todo: find a more user friendly way to show request/extension info */ ++ if (err->error_code >= 128) ++ { ++ fprintf (stderr, "X Extension Error: Error code %d\n", ++ err->error_code); ++ } ++ else ++ { ++ switch (err->error_code) ++ { ++ case XCB_REQUEST: ++ snprintf (buffer, sizeof(buffer), ": Bad Request"); ++ break; ++ ++ case XCB_VALUE: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Value: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_WINDOW: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Window: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_PIXMAP: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Pixmap: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_ATOM: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Atom: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_CURSOR: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Cursor: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_FONT: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Font: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_MATCH: ++ snprintf (buffer, sizeof(buffer), ": Bad Match"); ++ break; ++ ++ case XCB_DRAWABLE: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Drawable: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_ACCESS: ++ snprintf (buffer, sizeof(buffer), ": Access Denied"); ++ break; ++ ++ case XCB_ALLOC: ++ snprintf (buffer, sizeof(buffer), ++ ": Server Memory Allocation Failure"); ++ break; ++ ++ case XCB_COLORMAP: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Color: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_G_CONTEXT: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad GC: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_ID_CHOICE: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad XID: 0x%x", err->resource_id); ++ break; ++ ++ case XCB_NAME: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Name"); ++ break; ++ ++ case XCB_LENGTH: ++ snprintf (buffer, sizeof(buffer), ++ ": Bad Request Length"); ++ break; ++ ++ case XCB_IMPLEMENTATION: ++ snprintf (buffer, sizeof(buffer), ++ ": Server Implementation Failure"); ++ break; ++ ++ default: ++ snprintf (buffer, sizeof(buffer), ": Unknown error"); ++ break; ++ } ++ fprintf (stderr, "X Error: %d%s\n", err->error_code, buffer); ++ } ++ ++ fprintf (stderr, " Request Major code: %d\n", err->major_code); ++ if (err->major_code >= 128) ++ { ++ fprintf (stderr, " Request Minor code: %d\n", err->minor_code); ++ } ++ ++ fprintf (stderr, " Request serial number: %d\n", err->full_sequence); ++} +diff --git a/dsimple.h b/dsimple.h +index b0d76a5..1a689e0 100644 +--- a/dsimple.h ++++ b/dsimple.h +@@ -27,55 +27,33 @@ from The Open Group. + */ + + /* +- * Just_display.h: This file contains the definitions needed to use the +- * functions in just_display.c. It also declares the global +- * variables dpy, screen, and program_name which are needed to +- * use just_display.c. ++ * dsimple.h: This file contains the definitions needed to use the ++ * functions in dsimple.c. It also declares the global ++ * variable program_name which is needed to use dsimple.c. + * +- * Written by Mark Lillibridge. Last updated 7/1/87 +- * +- * Send bugs, etc. to chariot@athena.mit.edu. ++ * Written by Mark Lillibridge for Xlib. Last updated 7/1/87 ++ * Ported to XCB over two decades later. + */ + + #include ++#include ++#include + +- /* Simple helper macros */ +-#ifndef MAX +-#define MAX(a,b) (((a)>(b))?(a):(b)) +-#endif /* MAX */ +-#ifndef MIN +-#define MIN(a,b) (((a)<(b))?(a):(b)) +-#endif /* MIN */ ++typedef enum { False = 0, True } Bool; + + /* Global variables used by routines in dsimple.c */ + + extern char *program_name; /* Name of this program */ +-extern Display *dpy; /* The current display */ +-extern int screen; /* The current screen */ +- +-#define INIT_NAME program_name=argv[0] /* use this in main to setup +- program_name */ + +- /* Declaritions for functions in dsimple.c */ ++ /* Declarations for functions in dsimple.c */ + +-char *Get_Display_Name(int *, char **); +-Display *Open_Display(char *); +-void Setup_Display_And_Screen(int *, char **); +-void Close_Display(void); +-Window Select_Window_Args(int *, char **); +-void usage(void); ++const char *Get_Display_Name (const char *displayname); ++void Setup_Display_And_Screen (const char *displayname, ++ xcb_connection_t **dpy, xcb_screen_t **screen); + +-#define X_USAGE "[host:display]" /* X arguments handled by +- Get_Display_Name */ +- +-/* +- * Other_stuff.h: Definitions of routines in other_stuff. +- * +- * Written by Mark Lillibridge. Last updated 7/1/87 +- * +- * Send bugs, etc. to chariot@athena.mit.edu. +- */ ++xcb_window_t Select_Window(xcb_connection_t *, const xcb_screen_t *, int); ++xcb_window_t Window_With_Name(xcb_connection_t *, xcb_window_t, const char *); + +-Window Select_Window(Display *, int); +-Window Window_With_Name(Display *, Window, char *); + void Fatal_Error(char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2); ++ ++void Print_X_Error (xcb_connection_t *, xcb_generic_error_t *); +diff --git a/xwininfo.c b/xwininfo.c +index 6b2f728..ea1de2d 100644 +--- a/xwininfo.c ++++ b/xwininfo.c +@@ -1,5 +1,5 @@ + /* +- * Copyright © 1999 Sun Microsystems, Inc. All rights reserved. ++ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), +@@ -64,14 +64,16 @@ of the copyright holder. + */ + + #include "config.h" +-#include +-#include +-#include +-#include +-#include +-#include ++ ++#include ++#include ++#include ++#include ++ + #include + #include ++#include ++#include + + /* Include routines to handle parsing defaults */ + #include "dsimple.h" +@@ -81,29 +83,54 @@ typedef struct { + const char *name; + } binding; + +-static void scale_init (void); ++/* Information we keep track of for each window to allow prefetching/reusing */ ++struct wininfo { ++ xcb_window_t window; ++ ++ /* cookies for requests we've sent */ ++ xcb_get_geometry_cookie_t geometry_cookie; ++ xcb_get_property_cookie_t wm_name_cookie; ++ xcb_get_property_cookie_t wm_class_cookie; ++ xcb_translate_coordinates_cookie_t trans_coords_cookie; ++ xcb_query_tree_cookie_t tree_cookie; ++ xcb_get_window_attributes_cookie_t attr_cookie; ++ xcb_get_property_cookie_t normal_hints_cookie; ++ xcb_get_property_cookie_t hints_cookie; ++ xcb_get_property_cookie_t zoom_cookie; ++ ++ /* cached results from previous requests */ ++ xcb_get_geometry_reply_t * geometry; ++ xcb_get_window_attributes_reply_t * win_attributes; ++ xcb_size_hints_t * normal_hints; ++}; ++ ++static void scale_init (xcb_screen_t *scrn); + static char *nscale (int, int, int, char *, size_t); + static char *xscale (int); + static char *yscale (int); + static char *bscale (int); +-static int bad_window_handler (Display *, XErrorEvent *); + int main (int, char **); + static const char *LookupL (long, const binding *); + static const char *Lookup (int, const binding *); +-static void Display_Window_Id (Window, int); +-static void Display_Stats_Info (Window); +-static void Display_Bits_Info (Window); ++static void Display_Window_Id (struct wininfo *, Bool); ++static void Display_Stats_Info (struct wininfo *); ++static void Display_Bits_Info (struct wininfo *); + static void Display_Event_Mask (long); +-static void Display_Events_Info (Window); +-static void Display_Tree_Info (Window, int); +-static void display_tree_info_1 (Window, int, int); +-static void Display_Hints (XSizeHints *); +-static void Display_Size_Hints (Window); +-static void Display_Window_Shape (Window); +-static void Display_WM_Info (Window); ++static void Display_Events_Info (struct wininfo *); ++static void Display_Tree_Info (struct wininfo *, int); ++static void display_tree_info_1 (struct wininfo *, int, int); ++static void Display_Hints (xcb_size_hints_t *); ++static void Display_Size_Hints (struct wininfo *); ++static void Display_Window_Shape (xcb_window_t); ++static void Display_WM_Info (struct wininfo *); ++static void wininfo_wipe (struct wininfo *); + + static const char *window_id_format = "0x%lx"; + ++static xcb_connection_t *dpy; ++static xcb_screen_t *screen; ++static xcb_generic_error_t *err; ++ + #ifndef HAVE_STRLCAT + static size_t strlcat (char *dst, const char *src, size_t dstsize) + { +@@ -164,19 +191,18 @@ usage (void) + * + */ + +-#define getdsp(var,fn) var = fn (dpy, DefaultScreen (dpy)) + static int xp = 0, xmm = 0; + static int yp = 0, ymm = 0; + static int bp = 0, bmm = 0; + static int english = 0, metric = 0; + + static void +-scale_init (void) ++scale_init (xcb_screen_t *screen) + { +- getdsp (yp, DisplayHeight); +- getdsp (ymm, DisplayHeightMM); +- getdsp (xp, DisplayWidth); +- getdsp (xmm, DisplayWidthMM); ++ xp = screen->width_in_pixels; ++ yp = screen->height_in_pixels; ++ xmm = screen->width_in_millimeters; ++ ymm = screen->height_in_millimeters; + bp = xp + yp; + bmm = xmm + ymm; + } +@@ -250,9 +276,6 @@ static char xbuf[BUFSIZ]; + static char * + xscale (int x) + { +- if (!xp) { +- scale_init (); +- } + return (nscale (x, xp, xmm, xbuf, sizeof(xbuf))); + } + +@@ -260,9 +283,6 @@ static char ybuf[BUFSIZ]; + static char * + yscale (int y) + { +- if (!yp) { +- scale_init (); +- } + return (nscale (y, yp, ymm, ybuf, sizeof(ybuf))); + } + +@@ -270,53 +290,57 @@ static char bbuf[BUFSIZ]; + static char * + bscale (int b) + { +- if (!bp) { +- scale_init (); +- } + return (nscale (b, bp, bmm, bbuf, sizeof(bbuf))); + } + + /* end of pixel to inch, metric converter */ + +-/* This handler is enabled when we are checking +- to see if the -id the user specified is valid. */ +- +-/* ARGSUSED */ +-static int +-bad_window_handler (Display *disp, XErrorEvent *err) +-{ +- char badid[20]; +- +- snprintf (badid, sizeof(badid), window_id_format, err->resourceid); +- Fatal_Error ("No such window with id %s.", badid); +- exit (1); +- return 0; +-} +- +- + int + main (int argc, char **argv) + { + register int i; + int tree = 0, stats = 0, bits = 0, events = 0, wm = 0, size = 0, shape = 0; + int frame = 0, children = 0; +- Window window; ++ int use_root = 0; ++ xcb_window_t window = 0; ++ char *display_name = NULL; ++ const char *window_name = NULL; ++ struct wininfo wininfo; ++ struct wininfo *w = &wininfo; + +- INIT_NAME; ++ program_name = argv[0]; + + if (!setlocale (LC_ALL, "")) + fprintf (stderr, "%s: can not set locale properly\n", program_name); + +- /* Open display, handle command line arguments */ +- Setup_Display_And_Screen (&argc, argv); +- +- /* Get window selected on command line, if any */ +- window = Select_Window_Args (&argc, argv); ++ memset (w, 0, sizeof(struct wininfo)); + + /* Handle our command line arguments */ + for (i = 1; i < argc; i++) { + if (!strcmp (argv[i], "-help")) + usage (); ++ if (!strcmp (argv[i], "-display") || !strcmp (argv[i], "-d")) { ++ if (++i >= argc) ++ Fatal_Error("-display requires argument"); ++ display_name = argv[i]; ++ continue; ++ } ++ if (!strcmp (argv[i], "-root")) { ++ use_root = 1; ++ continue; ++ } ++ if (!strcmp (argv[i], "-id")) { ++ if (++i >= argc) ++ Fatal_Error("-id requires argument"); ++ window = strtoul(argv[i], NULL, 0); ++ continue; ++ } ++ if (!strcmp (argv[i], "-name")) { ++ if (++i >= argc) ++ Fatal_Error("-name requires argument"); ++ window_name = argv[i]; ++ continue; ++ } + if (!strcmp (argv[i], "-int")) { + window_id_format = "%ld"; + continue; +@@ -372,13 +396,26 @@ main (int argc, char **argv) + usage (); + } + ++ Setup_Display_And_Screen (display_name, &dpy, &screen); ++ ++ /* initialize scaling data */ ++ scale_init(screen); ++ ++ if (use_root) ++ window = screen->root; ++ else if (window_name) { ++ window = Window_With_Name (dpy, screen->root, window_name); ++ if (!window) ++ Fatal_Error ("No window with name \"%s\" exists!", window_name); ++ } ++ + /* If no window selected on command line, let user pick one the hard way */ + if (!window) { + printf ("\n" + "xwininfo: Please select the window about which you\n" + " would like information by clicking the\n" + " mouse in that window.\n"); +- window = Select_Window (dpy, !frame); ++ window = Select_Window (dpy, screen, !frame); + } + + /* +@@ -391,37 +428,102 @@ main (int argc, char **argv) + * make sure that the window is valid + */ + { +- Window root; +- int x, y; +- unsigned width, height, bw, depth; +- XErrorHandler old_handler; +- +- old_handler = XSetErrorHandler (bad_window_handler); +- XGetGeometry (dpy, window, &root, &x, &y, &width, &height, &bw, &depth); +- XSync (dpy, False); +- (void) XSetErrorHandler (old_handler); ++ xcb_get_geometry_cookie_t gg_cookie = ++ xcb_get_geometry (dpy, window); ++ ++ w->geometry = xcb_get_geometry_reply(dpy, gg_cookie, &err); ++ ++ if (!w->geometry) { ++ char badid[20]; ++ ++ if (err) ++ Print_X_Error (dpy, err); ++ ++ snprintf (badid, sizeof(badid), window_id_format, window); ++ Fatal_Error ("No such window with id %s.", badid); ++ } + } + ++ /* Send requests to prefetch data we'll need */ ++ w->window = window; ++ w->wm_name_cookie = xcb_get_wm_name (dpy, window); ++ if (children || tree) ++ w->tree_cookie = xcb_query_tree (dpy, window); ++ if (stats) { ++ w->trans_coords_cookie = ++ xcb_translate_coordinates (dpy, window, w->geometry->root, ++ -(w->geometry->border_width), ++ -(w->geometry->border_width)); ++ } ++ if (stats || bits || events) ++ w->attr_cookie = xcb_get_window_attributes (dpy, window); ++ if (stats || size) ++ w->normal_hints_cookie = xcb_get_wm_normal_hints (dpy, window); ++ if (wm) ++ w->hints_cookie = xcb_get_wm_hints(dpy, window); ++ if (size) ++ w->zoom_cookie = xcb_get_wm_size_hints (dpy, window, ++ XCB_ATOM_WM_ZOOM_HINTS); ++ xcb_flush (dpy); ++ + printf ("\nxwininfo: Window id: "); +- Display_Window_Id (window, True); ++ Display_Window_Id (w, True); + if (children || tree) +- Display_Tree_Info (window, tree); ++ Display_Tree_Info (w, tree); + if (stats) +- Display_Stats_Info (window); ++ Display_Stats_Info (w); + if (bits) +- Display_Bits_Info (window); ++ Display_Bits_Info (w); + if (events) +- Display_Events_Info (window); ++ Display_Events_Info (w); + if (wm) +- Display_WM_Info (window); ++ Display_WM_Info (w); + if (size) +- Display_Size_Hints (window); ++ Display_Size_Hints (w); + if (shape) + Display_Window_Shape (window); + printf ("\n"); ++ ++ wininfo_wipe (w); ++ xcb_disconnect (dpy); + exit (0); + } + ++/* Ensure win_attributes field is filled in */ ++static xcb_get_window_attributes_reply_t * ++fetch_win_attributes (struct wininfo *w) ++{ ++ if (!w->win_attributes) { ++ w->win_attributes = ++ xcb_get_window_attributes_reply (dpy, w->attr_cookie, &err); ++ ++ if (!w->win_attributes) { ++ Print_X_Error (dpy, err); ++ Fatal_Error ("Can't get window attributes."); ++ } ++ } ++ return w->win_attributes; ++} ++ ++/* Ensure normal_hints field is filled in */ ++static xcb_size_hints_t * ++fetch_normal_hints (struct wininfo *w, xcb_size_hints_t *hints_return) ++{ ++ xcb_size_hints_t hints; ++ ++ if (!w->normal_hints) { ++ if (xcb_get_wm_normal_hints_reply (dpy, w->normal_hints_cookie, ++ &hints, NULL)) { ++ w->normal_hints = malloc (sizeof(xcb_size_hints_t)); ++ if (w->normal_hints) ++ memcpy(w->normal_hints, &hints, sizeof(xcb_size_hints_t)); ++ } ++ } ++ if (hints_return && w->normal_hints) ++ memcpy(hints_return, w->normal_hints, sizeof(xcb_size_hints_t)); ++ return w->normal_hints; ++} ++ + + /* + * Lookup: lookup a code in a table. +@@ -458,41 +560,37 @@ Lookup (int code, const binding *table) + + /* + * Routine to display a window id in dec/hex with name if window has one ++ * ++ * Requires wininfo members initialized: window, wm_name_cookie + */ + + static void +-Display_Window_Id (Window window, Bool newline_wanted) ++Display_Window_Id (struct wininfo *w, Bool newline_wanted) + { +- XTextProperty tp; ++ xcb_get_text_property_reply_t prop; ++ uint8_t got_reply; + +- printf (window_id_format, window); /* print id # in hex/dec */ ++ printf (window_id_format, w->window); /* print id # in hex/dec */ + +- if (!window) { ++ if (!w->window) { + printf (" (none)"); + } else { +- if (window == RootWindow (dpy, screen)) { ++ if (w->window == screen->root) { + printf (" (the root window)"); + } +- if (!XGetWMName (dpy, window, &tp)) { /* Get window name if any */ ++ /* Get window name if any */ ++ got_reply = xcb_get_wm_name_reply (dpy, w->wm_name_cookie, ++ &prop, NULL); ++ if (!got_reply || prop.name_len == 0) { + printf (" (has no name)"); +- } else if (tp.nitems > 0) { ++ } else { + printf (" \""); +- { +- int count = 0, i, ret; +- char **list = NULL; +- ret = XmbTextPropertyToTextList (dpy, &tp, &list, &count); +- if ((ret == Success || ret > 0) && list != NULL){ +- for (i = 0; i < count; i++) +- printf ("%s", list[i]); +- XFreeStringList (list); +- } else { +- printf ("%s", tp.value); +- } +- } ++ /* XXX: need to handle encoding */ ++ printf ("%.*s", prop.name_len, prop.name); + printf ("\""); + } +- else +- printf (" (has no name)"); ++ if (got_reply) ++ xcb_get_text_property_reply_wipe (&prop); + } + + if (newline_wanted) +@@ -506,211 +604,244 @@ Display_Window_Id (Window window, Bool newline_wanted) + * Display Stats on window + */ + static const binding _window_classes[] = { +- { InputOutput, "InputOutput" }, +- { InputOnly, "InputOnly" }, ++ { XCB_WINDOW_CLASS_INPUT_OUTPUT, "InputOutput" }, ++ { XCB_WINDOW_CLASS_INPUT_ONLY, "InputOnly" }, + { 0, NULL } }; + + static const binding _map_states[] = { +- { IsUnmapped, "IsUnMapped" }, +- { IsUnviewable, "IsUnviewable" }, +- { IsViewable, "IsViewable" }, ++ { XCB_MAP_STATE_UNMAPPED, "IsUnMapped" }, ++ { XCB_MAP_STATE_UNVIEWABLE, "IsUnviewable" }, ++ { XCB_MAP_STATE_VIEWABLE, "IsViewable" }, + { 0, NULL } }; + + static const binding _backing_store_states[] = { +- { NotUseful, "NotUseful" }, +- { WhenMapped, "WhenMapped" }, +- { Always, "Always" }, ++ { XCB_BACKING_STORE_NOT_USEFUL, "NotUseful" }, ++ { XCB_BACKING_STORE_WHEN_MAPPED,"WhenMapped" }, ++ { XCB_BACKING_STORE_ALWAYS, "Always" }, + { 0, NULL } }; + + static const binding _bit_gravity_states[] = { +- { ForgetGravity, "ForgetGravity" }, +- { NorthWestGravity, "NorthWestGravity" }, +- { NorthGravity, "NorthGravity" }, +- { NorthEastGravity, "NorthEastGravity" }, +- { WestGravity, "WestGravity" }, +- { CenterGravity, "CenterGravity" }, +- { EastGravity, "EastGravity" }, +- { SouthWestGravity, "SouthWestGravity" }, +- { SouthGravity, "SouthGravity" }, +- { SouthEastGravity, "SouthEastGravity" }, +- { StaticGravity, "StaticGravity" }, ++ { XCB_GRAVITY_BIT_FORGET, "ForgetGravity" }, ++ { XCB_GRAVITY_NORTH_WEST, "NorthWestGravity" }, ++ { XCB_GRAVITY_NORTH, "NorthGravity" }, ++ { XCB_GRAVITY_NORTH_EAST, "NorthEastGravity" }, ++ { XCB_GRAVITY_WEST, "WestGravity" }, ++ { XCB_GRAVITY_CENTER, "CenterGravity" }, ++ { XCB_GRAVITY_EAST, "EastGravity" }, ++ { XCB_GRAVITY_SOUTH_WEST, "SouthWestGravity" }, ++ { XCB_GRAVITY_SOUTH, "SouthGravity" }, ++ { XCB_GRAVITY_SOUTH_EAST, "SouthEastGravity" }, ++ { XCB_GRAVITY_STATIC, "StaticGravity" }, + { 0, NULL }}; + + static const binding _window_gravity_states[] = { +- { UnmapGravity, "UnmapGravity" }, +- { NorthWestGravity, "NorthWestGravity" }, +- { NorthGravity, "NorthGravity" }, +- { NorthEastGravity, "NorthEastGravity" }, +- { WestGravity, "WestGravity" }, +- { CenterGravity, "CenterGravity" }, +- { EastGravity, "EastGravity" }, +- { SouthWestGravity, "SouthWestGravity" }, +- { SouthGravity, "SouthGravity" }, +- { SouthEastGravity, "SouthEastGravity" }, +- { StaticGravity, "StaticGravity" }, ++ { XCB_GRAVITY_WIN_UNMAP, "UnmapGravity" }, ++ { XCB_GRAVITY_NORTH_WEST, "NorthWestGravity" }, ++ { XCB_GRAVITY_NORTH, "NorthGravity" }, ++ { XCB_GRAVITY_NORTH_EAST, "NorthEastGravity" }, ++ { XCB_GRAVITY_WEST, "WestGravity" }, ++ { XCB_GRAVITY_CENTER, "CenterGravity" }, ++ { XCB_GRAVITY_EAST, "EastGravity" }, ++ { XCB_GRAVITY_SOUTH_WEST, "SouthWestGravity" }, ++ { XCB_GRAVITY_SOUTH, "SouthGravity" }, ++ { XCB_GRAVITY_SOUTH_EAST, "SouthEastGravity" }, ++ { XCB_GRAVITY_STATIC, "StaticGravity" }, + { 0, NULL }}; + + static const binding _visual_classes[] = { +- { StaticGray, "StaticGray" }, +- { GrayScale, "GrayScale" }, +- { StaticColor, "StaticColor" }, +- { PseudoColor, "PseudoColor" }, +- { TrueColor, "TrueColor" }, +- { DirectColor, "DirectColor" }, ++ { XCB_VISUAL_CLASS_STATIC_GRAY, "StaticGray" }, ++ { XCB_VISUAL_CLASS_GRAY_SCALE, "GrayScale" }, ++ { XCB_VISUAL_CLASS_STATIC_COLOR,"StaticColor" }, ++ { XCB_VISUAL_CLASS_PSEUDO_COLOR,"PseudoColor" }, ++ { XCB_VISUAL_CLASS_TRUE_COLOR, "TrueColor" }, ++ { XCB_VISUAL_CLASS_DIRECT_COLOR,"DirectColor" }, + { 0, NULL }}; + ++/* ++ * Requires wininfo members initialized: ++ * window, geometry, attr_cookie, trans_coords_cookie, normal_hints_cookie ++ */ + static void +-Display_Stats_Info (Window window) ++Display_Stats_Info (struct wininfo *w) + { +- XWindowAttributes win_attributes; +- XVisualInfo vistemplate, *vinfo; +- XSizeHints hints; +- int dw = DisplayWidth (dpy, screen), dh = DisplayHeight (dpy, screen); ++ xcb_translate_coordinates_reply_t *trans_coords; ++ xcb_get_window_attributes_reply_t *win_attributes; ++ xcb_size_hints_t hints; ++ ++ int dw = screen->width_in_pixels, dh = screen->height_in_pixels; + int rx, ry, xright, ybelow; + int showright = 0, showbelow = 0; +- Status status; +- Window wmframe; +- int junk; +- long longjunk; +- Window junkwin; +- +- if (!XGetWindowAttributes (dpy, window, &win_attributes)) +- Fatal_Error ("Can't get window attributes."); +- vistemplate.visualid = XVisualIDFromVisual (win_attributes.visual); +- vinfo = XGetVisualInfo (dpy, VisualIDMask, &vistemplate, &junk); +- +- (void) XTranslateCoordinates (dpy, window, win_attributes.root, +- -win_attributes.border_width, +- -win_attributes.border_width, +- &rx, &ry, &junkwin); +- +- xright = (dw - rx - win_attributes.border_width * 2 - +- win_attributes.width); +- ybelow = (dh - ry - win_attributes.border_width * 2 - +- win_attributes.height); ++ xcb_window_t wmframe, parent; ++ ++ trans_coords = ++ xcb_translate_coordinates_reply (dpy, w->trans_coords_cookie, NULL); ++ if (!trans_coords) ++ Fatal_Error ("Can't get translated coordinates."); ++ ++ rx = trans_coords->dst_x; ++ ry = trans_coords->dst_y; ++ free (trans_coords); ++ ++ xright = (dw - rx - w->geometry->border_width * 2 - ++ w->geometry->width); ++ ybelow = (dh - ry - w->geometry->border_width * 2 - ++ w->geometry->height); ++ + + printf ("\n"); + printf (" Absolute upper-left X: %s\n", xscale (rx)); + printf (" Absolute upper-left Y: %s\n", yscale (ry)); +- printf (" Relative upper-left X: %s\n", xscale (win_attributes.x)); +- printf (" Relative upper-left Y: %s\n", yscale (win_attributes.y)); +- printf (" Width: %s\n", xscale (win_attributes.width)); +- printf (" Height: %s\n", yscale (win_attributes.height)); +- printf (" Depth: %d\n", win_attributes.depth); +- printf (" Visual: 0x%lx\n", vinfo->visualid); +- printf (" Visual Class: %s\n", Lookup (vinfo->class, _visual_classes)); +- printf (" Border width: %s\n", bscale (win_attributes.border_width)); ++ printf (" Relative upper-left X: %s\n", xscale (w->geometry->x)); ++ printf (" Relative upper-left Y: %s\n", yscale (w->geometry->y)); ++ printf (" Width: %s\n", xscale (w->geometry->width)); ++ printf (" Height: %s\n", yscale (w->geometry->height)); ++ printf (" Depth: %d\n", w->geometry->depth); ++ ++ win_attributes = fetch_win_attributes (w); ++ ++ printf (" Visual: 0x%lx\n", (unsigned long) win_attributes->visual); ++ if (screen) ++ { ++ xcb_depth_iterator_t depth_iter; ++ xcb_visualtype_t *visual_type = NULL; ++ ++ depth_iter = xcb_screen_allowed_depths_iterator (screen); ++ for (; depth_iter.rem; xcb_depth_next (&depth_iter)) { ++ xcb_visualtype_iterator_t visual_iter; ++ ++ visual_iter = xcb_depth_visuals_iterator (depth_iter.data); ++ for (; visual_iter.rem; xcb_visualtype_next (&visual_iter)) { ++ if (screen->root_visual == visual_iter.data->visual_id) { ++ visual_type = visual_iter.data; ++ break; ++ } ++ } ++ } ++ if (visual_type) ++ printf (" Visual Class: %s\n", Lookup (visual_type->_class, ++ _visual_classes)); ++ } ++ ++ printf (" Border width: %s\n", bscale (w->geometry->border_width)); + printf (" Class: %s\n", +- Lookup (win_attributes.class, _window_classes)); ++ Lookup (win_attributes->_class, _window_classes)); + printf (" Colormap: 0x%lx (%sinstalled)\n", +- win_attributes.colormap, +- win_attributes.map_installed ? "" : "not "); ++ (unsigned long) win_attributes->colormap, ++ win_attributes->map_is_installed ? "" : "not "); + printf (" Bit Gravity State: %s\n", +- Lookup (win_attributes.bit_gravity, _bit_gravity_states)); ++ Lookup (win_attributes->bit_gravity, _bit_gravity_states)); + printf (" Window Gravity State: %s\n", +- Lookup (win_attributes.win_gravity, _window_gravity_states)); ++ Lookup (win_attributes->win_gravity, _window_gravity_states)); + printf (" Backing Store State: %s\n", +- Lookup (win_attributes.backing_store, _backing_store_states)); ++ Lookup (win_attributes->backing_store, _backing_store_states)); + printf (" Save Under State: %s\n", +- win_attributes.save_under ? "yes" : "no"); ++ win_attributes->save_under ? "yes" : "no"); + printf (" Map State: %s\n", +- Lookup (win_attributes.map_state, _map_states)); ++ Lookup (win_attributes->map_state, _map_states)); + printf (" Override Redirect State: %s\n", +- win_attributes.override_redirect ? "yes" : "no"); ++ win_attributes->override_redirect ? "yes" : "no"); + printf (" Corners: +%d+%d -%d+%d -%d-%d +%d-%d\n", + rx, ry, xright, ry, xright, ybelow, rx, ybelow); + +- XFree (vinfo); +- + /* + * compute geometry string that would recreate window + */ + printf (" -geometry "); + + /* compute size in appropriate units */ +- status = XGetWMNormalHints (dpy, window, &hints, &longjunk); +- if (status && hints.flags & PResizeInc && +- hints.width_inc != 0 && hints.height_inc != 0) { +- if (hints.flags & (PBaseSize|PMinSize)) { +- if (hints.flags & PBaseSize) { +- win_attributes.width -= hints.base_width; +- win_attributes.height -= hints.base_height; ++ if (!fetch_normal_hints (w, &hints)) ++ hints.flags = 0; ++ ++ if ((hints.flags & XCB_SIZE_HINT_P_RESIZE_INC) && ++ (hints.width_inc != 0) && (hints.height_inc != 0)) { ++ if (hints.flags & (XCB_SIZE_HINT_BASE_SIZE|XCB_SIZE_HINT_P_MIN_SIZE)) { ++ if (hints.flags & XCB_SIZE_HINT_BASE_SIZE) { ++ w->geometry->width -= hints.base_width; ++ w->geometry->height -= hints.base_height; + } else { + /* ICCCM says MinSize is default for BaseSize */ +- win_attributes.width -= hints.min_width; +- win_attributes.height -= hints.min_height; ++ w->geometry->width -= hints.min_width; ++ w->geometry->height -= hints.min_height; + } + } +- printf ("%dx%d", win_attributes.width/hints.width_inc, +- win_attributes.height/hints.height_inc); ++ printf ("%dx%d", w->geometry->width/hints.width_inc, ++ w->geometry->height/hints.height_inc); + } else +- printf ("%dx%d", win_attributes.width, win_attributes.height); ++ printf ("%dx%d", w->geometry->width, w->geometry->height); + +- if (!(hints.flags&PWinGravity)) +- hints.win_gravity = NorthWestGravity; /* per ICCCM */ ++ if (!(hints.flags & XCB_SIZE_HINT_P_WIN_GRAVITY)) ++ hints.win_gravity = XCB_GRAVITY_NORTH_WEST; /* per ICCCM */ + /* find our window manager frame, if any */ +- wmframe = window; +- while (True) { +- Window root, parent; +- Window *childlist; +- unsigned int ujunk; +- +- status = XQueryTree (dpy, wmframe, &root, &parent, &childlist, &ujunk); +- if (parent == root || !parent || !status) ++ for (wmframe = parent = w->window; parent != 0 ; wmframe = parent) { ++ xcb_query_tree_cookie_t qt_cookie; ++ xcb_query_tree_reply_t *tree; ++ ++ qt_cookie = xcb_query_tree (dpy, wmframe); ++ tree = xcb_query_tree_reply (dpy, qt_cookie, &err); ++ if (!tree) { ++ Print_X_Error (dpy, err); ++ Fatal_Error ("Can't query window tree."); ++ } ++ parent = tree->parent; ++ free (tree); ++ if (parent == w->geometry->root || !parent) + break; +- wmframe = parent; +- if (status && childlist) +- XFree ((char *)childlist); + } +- if (wmframe != window) { ++ if (wmframe != w->window) { + /* WM reparented, so find edges of the frame */ + /* Only works for ICCCM-compliant WMs, and then only if the + window has corner gravity. We would need to know the original width + of the window to correctly handle the other gravities. */ ++ xcb_get_geometry_cookie_t geom_cookie; ++ xcb_get_geometry_reply_t *frame_geometry; + +- XWindowAttributes frame_attr; ++ geom_cookie = xcb_get_geometry (dpy, wmframe); ++ frame_geometry = xcb_get_geometry_reply (dpy, geom_cookie, &err); + +- if (!XGetWindowAttributes (dpy, wmframe, &frame_attr)) +- Fatal_Error ("Can't get frame attributes."); ++ if (!frame_geometry) { ++ Print_X_Error (dpy, err); ++ Fatal_Error ("Can't get frame geometry."); ++ } + switch (hints.win_gravity) { +- case NorthWestGravity: case SouthWestGravity: +- case NorthEastGravity: case SouthEastGravity: +- case WestGravity: +- rx = frame_attr.x; ++ case XCB_GRAVITY_NORTH_WEST: case XCB_GRAVITY_SOUTH_WEST: ++ case XCB_GRAVITY_NORTH_EAST: case XCB_GRAVITY_SOUTH_EAST: ++ case XCB_GRAVITY_WEST: ++ rx = frame_geometry->x; + } + switch (hints.win_gravity) { +- case NorthWestGravity: case SouthWestGravity: +- case NorthEastGravity: case SouthEastGravity: +- case EastGravity: +- xright = dw - frame_attr.x - frame_attr.width - +- 2*frame_attr.border_width; ++ case XCB_GRAVITY_NORTH_WEST: case XCB_GRAVITY_SOUTH_WEST: ++ case XCB_GRAVITY_NORTH_EAST: case XCB_GRAVITY_SOUTH_EAST: ++ case XCB_GRAVITY_EAST: ++ xright = dw - frame_geometry->x - frame_geometry->width - ++ (2 * frame_geometry->border_width); + } + switch (hints.win_gravity) { +- case NorthWestGravity: case SouthWestGravity: +- case NorthEastGravity: case SouthEastGravity: +- case NorthGravity: +- ry = frame_attr.y; ++ case XCB_GRAVITY_NORTH_WEST: case XCB_GRAVITY_SOUTH_WEST: ++ case XCB_GRAVITY_NORTH_EAST: case XCB_GRAVITY_SOUTH_EAST: ++ case XCB_GRAVITY_NORTH: ++ ry = frame_geometry->y; + } + switch (hints.win_gravity) { +- case NorthWestGravity: case SouthWestGravity: +- case NorthEastGravity: case SouthEastGravity: +- case SouthGravity: +- ybelow = dh - frame_attr.y - frame_attr.height - +- 2*frame_attr.border_width; ++ case XCB_GRAVITY_NORTH_WEST: case XCB_GRAVITY_SOUTH_WEST: ++ case XCB_GRAVITY_NORTH_EAST: case XCB_GRAVITY_SOUTH_EAST: ++ case XCB_GRAVITY_SOUTH: ++ ybelow = dh - frame_geometry->y - frame_geometry->height - ++ (2 * frame_geometry->border_width); + } ++ free (frame_geometry); + } + /* If edge gravity, offer a corner on that edge (because the application + programmer cares about that edge), otherwise offer upper left unless + some other corner is close to an edge of the screen. + (For corner gravity, assume gravity was set by XWMGeometry. + For CenterGravity, it doesn't matter.) */ +- if (hints.win_gravity == EastGravity || ++ if (hints.win_gravity == XCB_GRAVITY_EAST || + (abs (xright) <= 100 && abs (xright) < abs (rx) +- && hints.win_gravity != WestGravity)) ++ && hints.win_gravity != XCB_GRAVITY_WEST)) + showright = 1; +- if (hints.win_gravity == SouthGravity || ++ if (hints.win_gravity == XCB_GRAVITY_SOUTH || + (abs (ybelow) <= 100 && abs (ybelow) < abs (ry) +- && hints.win_gravity != NorthGravity)) ++ && hints.win_gravity != XCB_GRAVITY_NORTH)) + showbelow = 1; + + if (showright) +@@ -729,24 +860,25 @@ Display_Stats_Info (Window window) + * Display bits info: + */ + static const binding _gravities[] = { +- { UnmapGravity, "UnMapGravity" }, /* WARNING: both of these have*/ +- { ForgetGravity, "ForgetGravity" }, /* the same value - see code */ +- { NorthWestGravity, "NorthWestGravity" }, +- { NorthGravity, "NorthGravity" }, +- { NorthEastGravity, "NorthEastGravity" }, +- { WestGravity, "WestGravity" }, +- { CenterGravity, "CenterGravity" }, +- { EastGravity, "EastGravity" }, +- { SouthWestGravity, "SouthWestGravity" }, +- { SouthGravity, "SouthGravity" }, +- { SouthEastGravity, "SouthEastGravity" }, +- { StaticGravity, "StaticGravity" }, ++ /* WARNING: the first two of these have the same value - see code */ ++ { XCB_GRAVITY_WIN_UNMAP, "UnMapGravity" }, ++ { XCB_GRAVITY_BIT_FORGET, "ForgetGravity" }, ++ { XCB_GRAVITY_NORTH_WEST, "NorthWestGravity" }, ++ { XCB_GRAVITY_NORTH, "NorthGravity" }, ++ { XCB_GRAVITY_NORTH_EAST, "NorthEastGravity" }, ++ { XCB_GRAVITY_WEST, "WestGravity" }, ++ { XCB_GRAVITY_CENTER, "CenterGravity" }, ++ { XCB_GRAVITY_EAST, "EastGravity" }, ++ { XCB_GRAVITY_SOUTH_WEST, "SouthWestGravity" }, ++ { XCB_GRAVITY_SOUTH, "SouthGravity" }, ++ { XCB_GRAVITY_SOUTH_EAST, "SouthEastGravity" }, ++ { XCB_GRAVITY_STATIC, "StaticGravity" }, + { 0, NULL } }; + + static const binding _backing_store_hint[] = { +- { NotUseful, "NotUseful" }, +- { WhenMapped, "WhenMapped" }, +- { Always, "Always" }, ++ { XCB_BACKING_STORE_NOT_USEFUL, "NotUseful" }, ++ { XCB_BACKING_STORE_WHEN_MAPPED,"WhenMapped" }, ++ { XCB_BACKING_STORE_ALWAYS, "Always" }, + { 0, NULL } }; + + static const binding _bool[] = { +@@ -754,26 +886,29 @@ static const binding _bool[] = { + { 1, "Yes" }, + { 0, NULL } }; + ++/* ++ * Requires wininfo members initialized: ++ * window, attr_cookie (or win_attributes) ++ */ + static void +-Display_Bits_Info (Window window) ++Display_Bits_Info (struct wininfo * w) + { +- XWindowAttributes win_attributes; +- +- if (!XGetWindowAttributes (dpy, window, &win_attributes)) +- Fatal_Error ("Can't get window attributes."); ++ xcb_get_window_attributes_reply_t *win_attributes ++ = fetch_win_attributes (w); + + printf ("\n"); + printf (" Bit gravity: %s\n", +- Lookup (win_attributes.bit_gravity, _gravities+1)); ++ Lookup (win_attributes->bit_gravity, _gravities+1)); + printf (" Window gravity: %s\n", +- Lookup (win_attributes.win_gravity, _gravities)); ++ Lookup (win_attributes->win_gravity, _gravities)); + printf (" Backing-store hint: %s\n", +- Lookup (win_attributes.backing_store, _backing_store_hint)); ++ Lookup (win_attributes->backing_store, _backing_store_hint)); + printf (" Backing-planes to be preserved: 0x%lx\n", +- win_attributes.backing_planes); +- printf (" Backing pixel: %ld\n", win_attributes.backing_pixel); ++ (unsigned long) win_attributes->backing_planes); ++ printf (" Backing pixel: %ld\n", ++ (unsigned long) win_attributes->backing_pixel); + printf (" Save-unders: %s\n", +- Lookup (win_attributes.save_under, _bool)); ++ Lookup (win_attributes->save_under, _bool)); + } + + +@@ -781,31 +916,31 @@ Display_Bits_Info (Window window) + * Routine to display all events in an event mask + */ + static const binding _event_mask_names[] = { +- { KeyPressMask, "KeyPress" }, +- { KeyReleaseMask, "KeyRelease" }, +- { ButtonPressMask, "ButtonPress" }, +- { ButtonReleaseMask, "ButtonRelease" }, +- { EnterWindowMask, "EnterWindow" }, +- { LeaveWindowMask, "LeaveWindow" }, +- { PointerMotionMask, "PointerMotion" }, +- { PointerMotionHintMask, "PointerMotionHint" }, +- { Button1MotionMask, "Button1Motion" }, +- { Button2MotionMask, "Button2Motion" }, +- { Button3MotionMask, "Button3Motion" }, +- { Button4MotionMask, "Button4Motion" }, +- { Button5MotionMask, "Button5Motion" }, +- { ButtonMotionMask, "ButtonMotion" }, +- { KeymapStateMask, "KeymapState" }, +- { ExposureMask, "Exposure" }, +- { VisibilityChangeMask, "VisibilityChange" }, +- { StructureNotifyMask, "StructureNotify" }, +- { ResizeRedirectMask, "ResizeRedirect" }, +- { SubstructureNotifyMask, "SubstructureNotify" }, +- { SubstructureRedirectMask, "SubstructureRedirect" }, +- { FocusChangeMask, "FocusChange" }, +- { PropertyChangeMask, "PropertyChange" }, +- { ColormapChangeMask, "ColormapChange" }, +- { OwnerGrabButtonMask, "OwnerGrabButton" }, ++ { XCB_EVENT_MASK_KEY_PRESS, "KeyPress" }, ++ { XCB_EVENT_MASK_KEY_RELEASE, "KeyRelease" }, ++ { XCB_EVENT_MASK_BUTTON_PRESS, "ButtonPress" }, ++ { XCB_EVENT_MASK_BUTTON_RELEASE, "ButtonRelease" }, ++ { XCB_EVENT_MASK_ENTER_WINDOW, "EnterWindow" }, ++ { XCB_EVENT_MASK_LEAVE_WINDOW, "LeaveWindow" }, ++ { XCB_EVENT_MASK_POINTER_MOTION, "PointerMotion" }, ++ { XCB_EVENT_MASK_POINTER_MOTION_HINT, "PointerMotionHint" }, ++ { XCB_EVENT_MASK_BUTTON_1_MOTION, "Button1Motion" }, ++ { XCB_EVENT_MASK_BUTTON_2_MOTION, "Button2Motion" }, ++ { XCB_EVENT_MASK_BUTTON_3_MOTION, "Button3Motion" }, ++ { XCB_EVENT_MASK_BUTTON_4_MOTION, "Button4Motion" }, ++ { XCB_EVENT_MASK_BUTTON_5_MOTION, "Button5Motion" }, ++ { XCB_EVENT_MASK_BUTTON_MOTION, "ButtonMotion" }, ++ { XCB_EVENT_MASK_KEYMAP_STATE, "KeymapState" }, ++ { XCB_EVENT_MASK_EXPOSURE, "Exposure" }, ++ { XCB_EVENT_MASK_VISIBILITY_CHANGE, "VisibilityChange" }, ++ { XCB_EVENT_MASK_STRUCTURE_NOTIFY, "StructureNotify" }, ++ { XCB_EVENT_MASK_RESIZE_REDIRECT, "ResizeRedirect" }, ++ { XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY, "SubstructureNotify" }, ++ { XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, "SubstructureRedirect" }, ++ { XCB_EVENT_MASK_FOCUS_CHANGE, "FocusChange" }, ++ { XCB_EVENT_MASK_PROPERTY_CHANGE, "PropertyChange" }, ++ { XCB_EVENT_MASK_COLOR_MAP_CHANGE, "ColormapChange" }, ++ { XCB_EVENT_MASK_OWNER_GRAB_BUTTON, "OwnerGrabButton" }, + { 0, NULL } }; + + static void +@@ -822,24 +957,25 @@ Display_Event_Mask (long mask) + + /* + * Display info on events ++ * ++ * Requires wininfo members initialized: ++ * window, attr_cookie (or win_attributes) + */ + static void +-Display_Events_Info (Window window) ++Display_Events_Info (struct wininfo *w) + { +- XWindowAttributes win_attributes; +- +- if (!XGetWindowAttributes (dpy, window, &win_attributes)) +- Fatal_Error ("Can't get window attributes."); ++ xcb_get_window_attributes_reply_t *win_attributes ++ = fetch_win_attributes (w); + + printf ("\n"); + printf (" Someone wants these events:\n"); +- Display_Event_Mask (win_attributes.all_event_masks); ++ Display_Event_Mask (win_attributes->all_event_masks); + + printf (" Do not propagate these events:\n"); +- Display_Event_Mask (win_attributes.do_not_propagate_mask); ++ Display_Event_Mask (win_attributes->do_not_propagate_mask); + + printf (" Override redirection?: %s\n", +- Lookup (win_attributes.override_redirect, _bool)); ++ Lookup (win_attributes->override_redirect, _bool)); + } + + +@@ -851,39 +987,48 @@ Display_Events_Info (Window window) + /* + * Display root, parent, and (recursively) children information + * recurse - true to show children information ++ * ++ * Requires wininfo members initialized: window, tree_cookie + */ + static void +-Display_Tree_Info (Window window, int recurse) ++Display_Tree_Info (struct wininfo *w, int recurse) + { +- display_tree_info_1 (window, recurse, 0); ++ display_tree_info_1 (w, recurse, 0); + } + + /* + * level - recursion level + */ + static void +-display_tree_info_1 (Window window, int recurse, int level) ++display_tree_info_1 (struct wininfo *w, int recurse, int level) + { + int i, j; +- int rel_x, rel_y, abs_x, abs_y; +- unsigned int width, height, border, depth; +- Window root_win, parent_win; + unsigned int num_children; +- Window *child_list; +- XClassHint classhint; ++ xcb_query_tree_reply_t *tree; + +- if (!XQueryTree (dpy, window, &root_win, &parent_win, &child_list, +- &num_children)) ++ tree = xcb_query_tree_reply (dpy, w->tree_cookie, &err); ++ if (!tree) { ++ Print_X_Error (dpy, err); + Fatal_Error ("Can't query window tree."); ++ } + + if (level == 0) { ++ struct wininfo rw, pw; ++ rw.window = tree->root; ++ rw.wm_name_cookie = xcb_get_wm_name (dpy, rw.window); ++ pw.window = tree->parent; ++ pw.wm_name_cookie = xcb_get_wm_name (dpy, pw.window); ++ xcb_flush (dpy); ++ + printf ("\n"); + printf (" Root window id: "); +- Display_Window_Id (root_win, True); ++ Display_Window_Id (&rw, True); + printf (" Parent window id: "); +- Display_Window_Id (parent_win, True); ++ Display_Window_Id (&pw, True); + } + ++ num_children = xcb_query_tree_children_length (tree); ++ + if (level == 0 || num_children > 0) { + printf (" "); + for (j = 0; j < level; j++) printf (" "); +@@ -891,42 +1036,90 @@ display_tree_info_1 (Window window, int recurse, int level) + num_children ? ":" : "."); + } + +- for (i = (int)num_children - 1; i >= 0; i--) { +- printf (" "); +- for (j = 0; j < level; j++) printf (" "); +- Display_Window_Id (child_list[i], False); +- printf (": ("); +- if (XGetClassHint (dpy, child_list[i], &classhint)) { +- if (classhint.res_name) { +- printf ("\"%s\" ", classhint.res_name); +- XFree (classhint.res_name); +- } else +- printf ("(none) "); +- if (classhint.res_class) { +- printf ("\"%s\") ", classhint.res_class); +- XFree (classhint.res_class); ++ if (num_children > 0) { ++ xcb_window_t *child_list = xcb_query_tree_children (tree); ++ struct wininfo *children ++ = calloc (num_children, sizeof(struct wininfo)); ++ ++ if (children == NULL) ++ Fatal_Error ("Failed to allocate memory in display_tree_info"); ++ ++ for (i = (int)num_children - 1; i >= 0; i--) { ++ struct wininfo *cw = &children[i]; ++ ++ cw->window = child_list[i]; ++ cw->wm_name_cookie = xcb_get_wm_name (dpy, child_list[i]); ++ cw->wm_class_cookie = xcb_get_wm_class (dpy, child_list[i]); ++ cw->geometry_cookie = xcb_get_geometry (dpy, child_list[i]); ++ cw->trans_coords_cookie = xcb_translate_coordinates ++ (dpy, child_list[i], tree->root, 0, 0); ++ if (recurse) ++ cw->tree_cookie = xcb_query_tree (dpy, child_list[i]); ++ } ++ xcb_flush (dpy); ++ ++ for (i = (int)num_children - 1; i >= 0; i--) { ++ struct wininfo *cw = &children[i]; ++ xcb_get_wm_class_reply_t classhint; ++ xcb_get_geometry_reply_t *geometry; ++ ++ printf (" "); ++ for (j = 0; j < level; j++) printf (" "); ++ Display_Window_Id (cw, False); ++ printf (": ("); ++ ++ if (xcb_get_wm_class_reply (dpy, cw->wm_class_cookie, ++ &classhint, NULL)) { ++ if (classhint.instance_name) ++ printf ("\"%s\" ", classhint.instance_name); ++ else ++ printf ("(none) "); ++ ++ if (classhint.class_name) ++ printf ("\"%s\") ", classhint.class_name); ++ else ++ printf ("(none)) "); ++ ++ xcb_get_wm_class_reply_wipe (&classhint); + } else +- printf ("(none)) "); +- } else +- printf (") "); +- +- if (XGetGeometry (dpy, child_list[i], &root_win, +- &rel_x, &rel_y, &width, &height, &border, &depth)) { +- Window child; +- +- printf (" %ux%u+%d+%d", width, height, rel_x, rel_y); +- if (XTranslateCoordinates (dpy, child_list[i], root_win, +- 0 ,0, &abs_x, &abs_y, &child)) { +- printf (" +%d+%d", abs_x - border, abs_y - border); ++ printf (") "); ++ ++ geometry = xcb_get_geometry_reply(dpy, cw->geometry_cookie, &err); ++ if (geometry) { ++ xcb_translate_coordinates_reply_t *trans_coords; ++ ++ printf (" %ux%u+%d+%d", geometry->width, geometry->height, ++ geometry->x, geometry->y); ++ ++ trans_coords = xcb_translate_coordinates_reply ++ (dpy, cw->trans_coords_cookie, &err); ++ ++ if (trans_coords) { ++ int16_t abs_x = (int16_t) trans_coords->dst_x; ++ int16_t abs_y = (int16_t) trans_coords->dst_y; ++ int border = geometry->border_width; ++ ++ printf (" +%d+%d", abs_x - border, abs_y - border); ++ free (trans_coords); ++ } else if (err) { ++ Print_X_Error (dpy, err); ++ } ++ ++ free (geometry); ++ } else if (err) { ++ Print_X_Error (dpy, err); + } +- } +- printf ("\n"); ++ printf ("\n"); + +- if (recurse) +- display_tree_info_1 (child_list[i], 1, level+1); ++ if (recurse) ++ display_tree_info_1 (cw, 1, level+1); ++ ++ wininfo_wipe (cw); ++ } ++ free (children); + } + +- if (child_list) XFree ((char *)child_list); ++ free (tree); /* includes storage for child_list[] */ + } + + +@@ -934,74 +1127,74 @@ display_tree_info_1 (Window window, int recurse, int level) + * Display a set of size hints + */ + static void +-Display_Hints (XSizeHints *hints) ++Display_Hints (xcb_size_hints_t *hints) + { + long flags; + + flags = hints->flags; + +- if (flags & USPosition) ++ if (flags & XCB_SIZE_HINT_US_POSITION) + printf (" User supplied location: %s, %s\n", + xscale (hints->x), yscale (hints->y)); + +- if (flags & PPosition) ++ if (flags & XCB_SIZE_HINT_P_POSITION) + printf (" Program supplied location: %s, %s\n", + xscale (hints->x), yscale (hints->y)); + +- if (flags & USSize) { ++ if (flags & XCB_SIZE_HINT_US_SIZE) { + printf (" User supplied size: %s by %s\n", + xscale (hints->width), yscale (hints->height)); + } + +- if (flags & PSize) ++ if (flags & XCB_SIZE_HINT_P_SIZE) + printf (" Program supplied size: %s by %s\n", + xscale (hints->width), yscale (hints->height)); + +- if (flags & PMinSize) ++ if (flags & XCB_SIZE_HINT_P_MIN_SIZE) + printf (" Program supplied minimum size: %s by %s\n", + xscale (hints->min_width), yscale (hints->min_height)); + +- if (flags & PMaxSize) ++ if (flags & XCB_SIZE_HINT_P_MAX_SIZE) + printf (" Program supplied maximum size: %s by %s\n", + xscale (hints->max_width), yscale (hints->max_height)); + +- if (flags & PBaseSize) { ++ if (flags & XCB_SIZE_HINT_BASE_SIZE) { + printf (" Program supplied base size: %s by %s\n", + xscale (hints->base_width), yscale (hints->base_height)); + } + +- if (flags & PResizeInc) { ++ if (flags & XCB_SIZE_HINT_P_RESIZE_INC) { + printf (" Program supplied x resize increment: %s\n", + xscale (hints->width_inc)); + printf (" Program supplied y resize increment: %s\n", + yscale (hints->height_inc)); + if (hints->width_inc != 0 && hints->height_inc != 0) { +- if (flags & USSize) ++ if (flags & XCB_SIZE_HINT_US_SIZE) + printf (" User supplied size in resize increments: %s by %s\n", + (xscale (hints->width / hints->width_inc)), + (yscale (hints->height / hints->height_inc))); +- if (flags & PSize) ++ if (flags & XCB_SIZE_HINT_P_SIZE) + printf (" Program supplied size in resize increments: %s by %s\n", + (xscale (hints->width / hints->width_inc)), + (yscale (hints->height / hints->height_inc))); +- if (flags & PMinSize) ++ if (flags & XCB_SIZE_HINT_P_MIN_SIZE) + printf (" Program supplied minimum size in resize increments: %s by %s\n", + xscale (hints->min_width / hints->width_inc), yscale (hints->min_height / hints->height_inc)); +- if (flags & PBaseSize) ++ if (flags & XCB_SIZE_HINT_BASE_SIZE) + printf (" Program supplied base size in resize increments: %s by %s\n", + (xscale (hints->base_width / hints->width_inc)), + (yscale (hints->base_height / hints->height_inc))); + } + } + +- if (flags & PAspect) { ++ if (flags & XCB_SIZE_HINT_P_ASPECT) { + printf (" Program supplied min aspect ratio: %s/%s\n", +- xscale (hints->min_aspect.x), yscale (hints->min_aspect.y)); ++ xscale (hints->min_aspect_num), yscale (hints->min_aspect_den)); + printf (" Program supplied max aspect ratio: %s/%s\n", +- xscale (hints->max_aspect.x), yscale (hints->max_aspect.y)); ++ xscale (hints->max_aspect_num), yscale (hints->max_aspect_den)); + } + +- if (flags & PWinGravity) { ++ if (flags & XCB_SIZE_HINT_P_WIN_GRAVITY) { + printf (" Program supplied window gravity: %s\n", + Lookup (hints->win_gravity, _gravities)); + } +@@ -1012,103 +1205,137 @@ Display_Hints (XSizeHints *hints) + * Display Size Hints info + */ + static void +-Display_Size_Hints (Window window) ++Display_Size_Hints (struct wininfo *w) + { +- XSizeHints *hints = XAllocSizeHints (); +- long supplied; ++ xcb_size_hints_t hints; + + printf ("\n"); +- if (!XGetWMNormalHints (dpy, window, hints, &supplied)) ++ if (!fetch_normal_hints (w, &hints)) + printf (" No normal window size hints defined\n"); + else { + printf (" Normal window size hints:\n"); +- hints->flags &= supplied; +- Display_Hints (hints); ++ Display_Hints (&hints); + } + +- if (!XGetWMSizeHints (dpy, window, hints, &supplied, XA_WM_ZOOM_HINTS)) ++ if (!xcb_get_wm_size_hints_reply (dpy, w->zoom_cookie, &hints, NULL)) + printf (" No zoom window size hints defined\n"); + else { + printf (" Zoom window size hints:\n"); +- hints->flags &= supplied; +- Display_Hints (hints); ++ Display_Hints (&hints); + } +- XFree ((char *)hints); + } + + + static void +-Display_Window_Shape (Window window) ++Display_Window_Shape (xcb_window_t window) + { +- Bool ws, bs; +- int xws, yws, xbs, ybs; +- unsigned int wws, hws, wbs, hbs; ++ const xcb_query_extension_reply_t *shape_query; ++ xcb_shape_query_extents_cookie_t extents_cookie; ++ xcb_shape_query_extents_reply_t *extents; + +- if (!XShapeQueryExtension (dpy, &bs, &ws)) ++ shape_query = xcb_get_extension_data (dpy, &xcb_shape_id); ++ if (!shape_query->present) + return; + + printf ("\n"); +- XShapeQueryExtents (dpy, window, &ws, &xws, &yws, &wws, &hws, +- &bs, &xbs, &ybs, &wbs, &hbs); +- if (!ws) ++ ++ extents_cookie = xcb_shape_query_extents (dpy, window); ++ extents = xcb_shape_query_extents_reply (dpy, extents_cookie, &err); ++ ++ if (!extents) { ++ if (err) ++ Print_X_Error (dpy, err); ++ else ++ { ++ printf (" No window shape defined\n"); ++ printf (" No border shape defined\n"); ++ } ++ return; ++ } ++ ++ if (!extents->bounding_shaped) + printf (" No window shape defined\n"); + else { + printf (" Window shape extents: %sx%s", +- xscale (wws), yscale (hws)); +- printf ("+%s+%s\n", xscale (xws), yscale (yws)); ++ xscale (extents->bounding_shape_extents_width), ++ yscale (extents->bounding_shape_extents_height)); ++ printf ("+%s+%s\n", ++ xscale (extents->bounding_shape_extents_x), ++ yscale (extents->bounding_shape_extents_y)); + } +- if (!bs) ++ if (!extents->clip_shaped) + printf (" No border shape defined\n"); + else { + printf (" Border shape extents: %sx%s", +- xscale (wbs), yscale (hbs)); +- printf ("+%s+%s\n", xscale (xbs), yscale (ybs)); ++ xscale (extents->clip_shape_extents_width), ++ yscale (extents->clip_shape_extents_height)); ++ printf ("+%s+%s\n", ++ xscale (extents->clip_shape_extents_x), ++ yscale (extents->clip_shape_extents_y)); + } ++ ++ free (extents); + } + + /* + * Display Window Manager Info ++ * ++ * Requires wininfo members initialized: ++ * window, hints_cookie + */ + static const binding _state_hints[] = { +- { DontCareState, "Don't Care State" }, +- { NormalState, "Normal State" }, +- { ZoomState, "Zoomed State" }, +- { IconicState, "Iconic State" }, +- { InactiveState, "Inactive State" }, ++ { XCB_WM_STATE_WITHDRAWN, "Withdrawn State" }, ++ { XCB_WM_STATE_NORMAL, "Normal State" }, ++ { XCB_WM_STATE_ICONIC, "Iconic State" }, ++/* xwininfo previously also reported the ZoomState & InactiveState, ++ but ICCCM declared those obsolete long ago */ + { 0, NULL } }; + + static void +-Display_WM_Info (Window window) ++Display_WM_Info (struct wininfo *w) + { +- XWMHints *wmhints; ++ xcb_wm_hints_t wmhints; + long flags; + +- wmhints = XGetWMHints (dpy, window); + printf ("\n"); +- if (!wmhints) { ++ if (!xcb_get_wm_hints_reply(dpy, w->hints_cookie, &wmhints, &err)) ++ { + printf (" No window manager hints defined\n"); ++ if (err) ++ Print_X_Error (dpy, err); + return; + } +- flags = wmhints->flags; ++ flags = wmhints.flags; + + printf (" Window manager hints:\n"); + +- if (flags & InputHint) ++ if (flags & XCB_WM_HINT_INPUT) + printf (" Client accepts input or input focus: %s\n", +- Lookup (wmhints->input, _bool)); ++ Lookup (wmhints.input, _bool)); ++ ++ if (flags & XCB_WM_HINT_ICON_WINDOW) { ++ struct wininfo iw; ++ iw.window = wmhints.icon_window; ++ iw.wm_name_cookie = xcb_get_wm_name (dpy, iw.window); + +- if (flags & IconWindowHint) { + printf (" Icon window id: "); +- Display_Window_Id (wmhints->icon_window, True); ++ Display_Window_Id (&iw, True); + } + +- if (flags & IconPositionHint) ++ if (flags & XCB_WM_HINT_ICON_POSITION) + printf (" Initial icon position: %s, %s\n", +- xscale (wmhints->icon_x), yscale (wmhints->icon_y)); ++ xscale (wmhints.icon_x), yscale (wmhints.icon_y)); + +- if (flags & StateHint) ++ if (flags & XCB_WM_HINT_STATE) + printf (" Initial state is %s\n", +- Lookup (wmhints->initial_state, _state_hints)); ++ Lookup (wmhints.initial_state, _state_hints)); ++} + +- XFree (wmhints); ++/* Frees all members of a wininfo struct, but not the struct itself */ ++static void ++wininfo_wipe (struct wininfo *w) ++{ ++ free (w->geometry); ++ free (w->win_attributes); ++ free (w->normal_hints); + } +-- +cgit v0.8.3-6-g21f6 -- cgit v1.2.3 From abb0e46623394c13aa0c678c8a3107c507b6fe7d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 17 Jul 2010 20:38:57 +0000 Subject: testing/xwininfo: fix license --- testing/xwininfo/APKBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/xwininfo/APKBUILD b/testing/xwininfo/APKBUILD index 4755ff9cd7..5074e3620e 100644 --- a/testing/xwininfo/APKBUILD +++ b/testing/xwininfo/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Natanael Copa pkgname=xwininfo pkgver=1.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="Window information utility for X" url="http://cgit.freedesktop.org/xorg/app/xwininfo/" -license="GPL" +license="custom" depends= makedepends="libx11-dev libxext-dev" install= @@ -28,6 +28,7 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } md5sums="908f8bc3255f639effa9780fb1c19ea4 xwininfo-1.0.5.tar.bz2" -- cgit v1.2.3 From 1352fbbf5547e1bb840194e877c1e77faf76ccca Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 17 Jul 2010 20:43:02 +0000 Subject: testing/xwininfo: remove bogus patch --- ...tml?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab | 2536 -------------------- 1 file changed, 2536 deletions(-) delete mode 100644 testing/xwininfo/index.html?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab (limited to 'testing') diff --git a/testing/xwininfo/index.html?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab b/testing/xwininfo/index.html?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab deleted file mode 100644 index 35c007c4f4..0000000000 --- a/testing/xwininfo/index.html?id=96f19bade9ce4940642d580f4c52e2bc0e3539ab +++ /dev/null @@ -1,2536 +0,0 @@ -From 96f19bade9ce4940642d580f4c52e2bc0e3539ab Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sun, 13 Jun 2010 19:42:34 +0000 -Subject: Convert from Xlib to xcb - -Testing was done with a simple GNOME 2.28 session with a number of -applications open (gnome-terminal, VirtualBox, Firefox). - -Primary test case was xwininfo -root -all, which listed 114 children of -the root window. Output was identical to Xlib version (after applying -the fix to libxcb_icccm for always null-terminating wm_class properties). - -Over a local connection on the same machine: - -Xlib: 0.00u 0.01s 0:00.05 20.0% -xcb: 0.00u 0.00s 0:00.02 0.0% - -(i.e. barely measurable difference - I had more variation between - repeated runs of the command) - -Introducing latency by running over ssh -X from California to Beijing -and back: - -Xlib: 0.03u 0.02s 8:19.12 0.0% -xcb: 0.00u 0.00s 0:45.26 0.0% - -Memory size when exit() is called: - -Xlib: - Address Kbytes RSS Anon Locked Mode Mapped File -08043000 20 20 20 - rw--- [ stack ] -08400000 144 144 144 - rw--- [ heap ] -total Kb 8972 8640 316 - - -xcb: - Address Kbytes RSS Anon Locked Mode Mapped File -08045000 12 12 12 - rwx-- [ stack ] -0806C000 100 100 100 - rwx-- [ heap ] -total Kb 7980 7692 288 - - -Bytes sent & received (counted by proxying via xscope): - -Xlib: Client --> Server: 21380 bytes Client <-- Server: 54124 bytes -xcb: Client --> Server: 21114 bytes Client <-- Server: 53160 bytes - -(The Xlib code didn't save any replies, so re-requested a couple of things - when running with -all - I fixed that while porting to xcb, but the same - could be done with Xlib easily too.) - -Not yet handled: WM_NAME properties that need to be converted from another -character encoding. - -Signed-off-by: Alan Coopersmith -Reviewed-by: James Cloos ---- -diff --git a/COPYING b/COPYING -index 10b416d..687540f 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,4 +1,4 @@ --Copyright © 1999 Sun Microsystems, Inc. All rights reserved. -+Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), -diff --git a/clientwin.c b/clientwin.c -index cce35ad..fe6bd18 100644 ---- a/clientwin.c -+++ b/clientwin.c -@@ -19,47 +19,59 @@ - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - */ --#include --#include -+#include -+#include -+ -+#include -+#include - - #include "clientwin.h" - --static Atom atom_wm_state = None; -+static xcb_atom_t atom_wm_state = XCB_ATOM_NONE; -+typedef enum { False = 0, True } Bool; - - /* - * Check if window has given property - */ - static Bool --Window_Has_Property(Display * dpy, Window win, Atom atom) -+Window_Has_Property(xcb_connection_t * dpy, xcb_window_t win, xcb_atom_t atom) - { -- Atom type_ret; -- int format_ret; -- unsigned char *prop_ret; -- unsigned long bytes_after, num_ret; -- -- type_ret = None; -- prop_ret = NULL; -- XGetWindowProperty(dpy, win, atom, 0, 0, False, AnyPropertyType, -- &type_ret, &format_ret, &num_ret, -- &bytes_after, &prop_ret); -- if (prop_ret) -- XFree(prop_ret); -- -- return (type_ret != None) ? True : False; -+ xcb_get_property_cookie_t prop_cookie; -+ xcb_get_property_reply_t *prop_reply; -+ -+ prop_cookie = xcb_get_property (dpy, False, win, atom, -+ XCB_GET_PROPERTY_TYPE_ANY, 0, 0); -+ -+ prop_reply = xcb_get_property_reply (dpy, prop_cookie, NULL); -+ -+ if (prop_reply) { -+ xcb_atom_t reply_type = prop_reply->type; -+ free (prop_reply); -+ if (reply_type != XCB_NONE) -+ return True; -+ } -+ -+ return False; - } - - /* - * Check if window is viewable - */ - static Bool --Window_Is_Viewable(Display * dpy, Window win) -+Window_Is_Viewable(xcb_connection_t * dpy, xcb_window_t win) - { -- Bool ok; -- XWindowAttributes xwa; -+ Bool ok = False; -+ xcb_get_window_attributes_cookie_t attr_cookie; -+ xcb_get_window_attributes_reply_t *xwa; - -- XGetWindowAttributes(dpy, win, &xwa); -+ attr_cookie = xcb_get_window_attributes (dpy, win); -+ xwa = xcb_get_window_attributes_reply (dpy, attr_cookie, NULL); - -- ok = (xwa.class == InputOutput) && (xwa.map_state == IsViewable); -+ if (xwa) { -+ ok = (xwa->_class == XCB_WINDOW_CLASS_INPUT_OUTPUT) && -+ (xwa->map_state == XCB_MAP_STATE_VIEWABLE); -+ free (xwa); -+ } - - return ok; - } -@@ -70,24 +82,32 @@ Window_Is_Viewable(Display * dpy, Window win) - * Children are searched in top-down stacking order. - * The first matching window is returned, None if no match is found. - */ --static Window --Find_Client_In_Children(Display * dpy, Window win) -+static xcb_window_t -+Find_Client_In_Children(xcb_connection_t * dpy, xcb_window_t win) - { -- Window root, parent; -- Window *children; -+ xcb_query_tree_cookie_t qt_cookie; -+ xcb_query_tree_reply_t *tree; -+ xcb_window_t *children; - unsigned int n_children; - int i; - -- if (!XQueryTree(dpy, win, &root, &parent, &children, &n_children)) -- return None; -- if (!children) -- return None; -+ qt_cookie = xcb_query_tree (dpy, win); -+ tree = xcb_query_tree_reply (dpy, qt_cookie, NULL); -+ if (!tree) -+ return XCB_WINDOW_NONE; -+ n_children = xcb_query_tree_children_length (tree); -+ if (!n_children) { -+ free (tree); -+ return XCB_WINDOW_NONE; -+ } -+ children = xcb_query_tree_children (tree); - - /* Check each child for WM_STATE and other validity */ -- win = None; -+ win = XCB_WINDOW_NONE; - for (i = (int) n_children - 1; i >= 0; i--) { - if (!Window_Is_Viewable(dpy, children[i])) { -- children[i] = None; /* Don't bother descending into this one */ -+ /* Don't bother descending into this one */ -+ children[i] = XCB_WINDOW_NONE; - continue; - } - if (!Window_Has_Property(dpy, children[i], atom_wm_state)) -@@ -100,15 +120,15 @@ Find_Client_In_Children(Display * dpy, Window win) - - /* No children matched, now descend into each child */ - for (i = (int) n_children - 1; i >= 0; i--) { -- if (children[i] == None) -+ if (children[i] == XCB_WINDOW_NONE) - continue; - win = Find_Client_In_Children(dpy, children[i]); -- if (win != None) -+ if (win != XCB_WINDOW_NONE) - break; - } - - done: -- XFree(children); -+ free (tree); /* includes children */ - - return win; - } -@@ -116,49 +136,68 @@ Find_Client_In_Children(Display * dpy, Window win) - /* - * Find virtual roots (_NET_VIRTUAL_ROOTS) - */ --static unsigned long * --Find_Roots(Display * dpy, Window root, unsigned int *num) -+static xcb_window_t * -+Find_Roots(xcb_connection_t * dpy, xcb_window_t root, unsigned int *num) - { -- Atom type_ret; -- int format_ret; -- unsigned char *prop_ret; -- unsigned long bytes_after, num_ret; -- Atom atom; -+ xcb_atom_t atom = XCB_ATOM_NONE; -+ xcb_intern_atom_cookie_t atom_cookie; -+ xcb_intern_atom_reply_t *atom_reply; -+ -+ xcb_get_property_cookie_t prop_cookie; -+ xcb_get_property_reply_t *prop_reply; -+ -+ xcb_window_t *prop_ret = NULL; - - *num = 0; -- atom = XInternAtom(dpy, "_NET_VIRTUAL_ROOTS", False); -+ -+ atom_cookie = xcb_intern_atom (dpy, False, strlen("_NET_VIRTUAL_ROOTS"), -+ "_NET_VIRTUAL_ROOTS"); -+ atom_reply = xcb_intern_atom_reply (dpy, atom_cookie, NULL); -+ if (atom_reply) { -+ atom = atom_reply->atom; -+ free (atom_reply); -+ } - if (!atom) - return NULL; - -- type_ret = None; -- prop_ret = NULL; -- if (XGetWindowProperty(dpy, root, atom, 0, 0x7fffffff, False, -- XA_WINDOW, &type_ret, &format_ret, &num_ret, -- &bytes_after, &prop_ret) != Success) -+ prop_cookie = xcb_get_property (dpy, False, root, atom, XCB_ATOM_WINDOW, -+ 0, 0x7fffffff); -+ prop_reply = xcb_get_property_reply (dpy, prop_cookie, NULL); -+ if (!prop_reply) - return NULL; - -- if (prop_ret && type_ret == XA_WINDOW && format_ret == 32) { -- *num = num_ret; -- return ((unsigned long *) prop_ret); -+ if ((prop_reply->value_len > 0) && (prop_reply->type == XCB_ATOM_WINDOW) -+ && (prop_reply->format == 32)) { -+ int length = xcb_get_property_value_length (prop_reply); -+ prop_ret = malloc(length); -+ if (prop_ret) { -+ memcpy (prop_ret, xcb_get_property_value(prop_reply), length); -+ *num = prop_reply->value_len; -+ } - } -- if (prop_ret) -- XFree(prop_ret); -+ free (prop_reply); - -- return NULL; -+ return prop_ret; - } - - /* - * Find child window at pointer location - */ --static Window --Find_Child_At_Pointer(Display * dpy, Window win) -+static xcb_window_t -+Find_Child_At_Pointer(xcb_connection_t * dpy, xcb_window_t win) - { -- Window root_return, child_return; -- int dummyi; -- unsigned int dummyu; -+ xcb_window_t child_return = XCB_WINDOW_NONE; -+ -+ xcb_query_pointer_cookie_t qp_cookie; -+ xcb_query_pointer_reply_t *qp_reply; - -- XQueryPointer(dpy, win, &root_return, &child_return, -- &dummyi, &dummyi, &dummyi, &dummyi, &dummyu); -+ qp_cookie = xcb_query_pointer (dpy, win); -+ qp_reply = xcb_query_pointer_reply (dpy, qp_cookie, NULL); -+ -+ if (qp_reply) { -+ child_return = qp_reply->child; -+ free (qp_reply); -+ } - - return child_return; - } -@@ -175,12 +214,12 @@ Find_Child_At_Pointer(Display * dpy, Window win) - * This will of course work only if the virtual roots are children of the real - * root. - */ --Window --Find_Client(Display * dpy, Window root, Window subwin) -+xcb_window_t -+Find_Client(xcb_connection_t * dpy, xcb_window_t root, xcb_window_t subwin) - { -- unsigned long *roots; -+ xcb_window_t *roots; - unsigned int i, n_roots; -- Window win; -+ xcb_window_t win; - - /* Check if subwin is a virtual root */ - roots = Find_Roots(dpy, root, &n_roots); -@@ -188,16 +227,24 @@ Find_Client(Display * dpy, Window root, Window subwin) - if (subwin != roots[i]) - continue; - win = Find_Child_At_Pointer(dpy, subwin); -- if (win == None) -+ if (win == XCB_WINDOW_NONE) - return subwin; /* No child - Return virtual root. */ - subwin = win; - break; - } -- if (roots) -- XFree(roots); -+ free (roots); - -- if (atom_wm_state == None) { -- atom_wm_state = XInternAtom(dpy, "WM_STATE", False); -+ if (atom_wm_state == XCB_ATOM_NONE) { -+ xcb_intern_atom_cookie_t atom_cookie; -+ xcb_intern_atom_reply_t *atom_reply; -+ -+ atom_cookie = xcb_intern_atom (dpy, False, -+ strlen("WM_STATE"), "WM_STATE"); -+ atom_reply = xcb_intern_atom_reply (dpy, atom_cookie, NULL); -+ if (atom_reply) { -+ atom_wm_state = atom_reply->atom; -+ free (atom_reply); -+ } - if (!atom_wm_state) - return subwin; - } -@@ -208,7 +255,7 @@ Find_Client(Display * dpy, Window root, Window subwin) - - /* Attempt to find a client window in subwin's children */ - win = Find_Client_In_Children(dpy, subwin); -- if (win != None) -+ if (win != XCB_WINDOW_NONE) - return win; /* Found a client */ - - /* Did not find a client */ -diff --git a/clientwin.h b/clientwin.h -index 9fc59b5..05aa202 100644 ---- a/clientwin.h -+++ b/clientwin.h -@@ -22,8 +22,10 @@ - #ifndef _CLIENTWIN_H_ - #define _CLIENTWIN_H_ - --#include -+#include -+#include - --extern Window Find_Client(Display * dpy, Window root, Window target_win); -+extern xcb_window_t Find_Client(xcb_connection_t * dpy, xcb_window_t root, -+ xcb_window_t target_win); - - #endif -diff --git a/configure.ac b/configure.ac -index 7ef640a..3337c6c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,8 +41,10 @@ XORG_DEFAULT_OPTIONS - AC_CHECK_FUNCS([strlcat]) - - # Checks for pkg-config packages --PKG_CHECK_MODULES(XWININFO, xext x11 [xproto >= 7.0.17]) --AC_SUBST(XWININFO_CFLAGS) --AC_SUBST(XWININFO_LIBS) -+PKG_CHECK_MODULES(XWININFO, [xcb >= 1.6] xcb-icccm xcb-shape) -+# Even when using xcb, xproto is still required for Xfuncproto.h -+# and libX11 headers for cursorfont.h -+PKG_CHECK_MODULES(XLIB, x11 [xproto >= 7.0.17]) -+XWININFO_CFLAGS="${XWININFO_CFLAGS} ${XLIB_CFLAGS}" - - AC_OUTPUT([Makefile]) -diff --git a/dsimple.c b/dsimple.c -index 51df01f..d1accf7 100644 ---- a/dsimple.c -+++ b/dsimple.c -@@ -1,4 +1,26 @@ - /* -+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+/* - - Copyright 1993, 1998 The Open Group - -@@ -26,19 +48,14 @@ from The Open Group. - - */ - --#include --#include --#include -+#include -+#include -+#include - #include - #include - #include - #include --/* -- * Other_stuff.h: Definitions of routines in other_stuff. -- * -- * Written by Mark Lillibridge. Last updated 7/1/87 -- */ -- -+#include - #include "clientwin.h" - #include "dsimple.h" - -@@ -46,72 +63,33 @@ from The Open Group. - * Just_display: A group of routines designed to make the writing of simple - * X11 applications which open a display but do not open - * any windows much faster and easier. Unless a routine says -- * otherwise, it may be assumed to require program_name, dpy, -- * and screen already defined on entry. -+ * otherwise, it may be assumed to require program_name -+ * to be already defined on entry. - * - * Written by Mark Lillibridge. Last updated 7/1/87 - */ - - --/* This stuff is defined in the calling program by just_display.h */ -+/* This stuff is defined in the calling program by dsimple.h */ - char *program_name = "unknown_program"; --Display *dpy = NULL; --int screen = 0; -- - - /* -- * Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete) -- * If found, remove it from command line. Don't go past a lone -. -+ * Get_Display_Name (argc, argv) - return string representing display name -+ * that would be used given the specified argument (i.e. if it's NULL, check -+ * getenv("DISPLAY") - always returns a non-NULL pointer, though it may be -+ * an unwritable constant, so is safe to printf() on platforms that crash -+ * on NULL printf arguments. - */ --char *Get_Display_Name ( -- int *pargc, /* MODIFIED */ -- char **argv) /* MODIFIED */ -+const char *Get_Display_Name (const char *display_name) - { -- int argc = *pargc; -- char **pargv = argv+1; -- char *displayname = NULL; -- int i; -- -- for (i = 1; i < argc; i++) { -- char *arg = argv[i]; -- -- if (!strcmp (arg, "-display") || !strcmp (arg, "-d")) { -- if (++i >= argc) usage (); -+ const char *name = display_name; - -- displayname = argv[i]; -- *pargc -= 2; -- continue; -- } -- if (!strcmp (arg,"-")) { -- while (i Selects window with id . may -- * be either in decimal or hex. -- * -name Selects the window with name . -- * -- * Call as Select_Window_Args(&argc, argv) in main before -- * parsing any of your program's command line arguments. -- * Select_Window_Args will remove its arguments so that -- * your program does not have to worry about them. -- * The window returned is the window selected or 0 if -- * none of the above arguments was present. If 0 is -- * returned, Select_Window should probably be called after -- * all command line arguments, and other setup is done. -- * For examples of usage, see xwininfo, xwd, or xprop. -+ * xcb equivalent of XCreateFontCursor - */ --Window Select_Window_Args ( -- int *rargc, -- char **argv) --#define ARGC (*rargc) -+static xcb_cursor_t -+Create_Font_Cursor (xcb_connection_t *dpy, uint16_t glyph) - { -- int nargc = 1; -- int argc; -- char **nargv; -- Window w = 0; -- -- nargv = argv+1; argc = ARGC; --#define OPTION argv[0] --#define NXTOPTP ++argv, --argc>0 --#define NXTOPT if (++argv, --argc==0) usage() --#define COPYOPT nargv++[0]=OPTION, nargc++ -- -- while (NXTOPTP) { -- if (!strcmp (OPTION, "-")) { -- COPYOPT; -- while (NXTOPTP) -- COPYOPT; -- break; -- } -- if (!strcmp (OPTION, "-root")) { -- w = RootWindow (dpy, screen); -- continue; -- } -- if (!strcmp (OPTION, "-name")) { -- NXTOPT; -- w = Window_With_Name (dpy, RootWindow (dpy, screen), OPTION); -- if (!w) -- Fatal_Error ("No window with name %s exists!", OPTION); -- continue; -- } -- if (!strcmp (OPTION, "-id")) { -- NXTOPT; -- w = 0; -- sscanf (OPTION, "0x%lx", &w); -- if (!w) -- sscanf (OPTION, "%lu", &w); -- if (!w) -- Fatal_Error ("Invalid window id format: %s.", OPTION); -- continue; -- } -- COPYOPT; -- } -- ARGC = nargc; -+ static xcb_font_t cursor_font; -+ xcb_cursor_t cursor; - -- return (w); --} -+ if (!cursor_font) { -+ cursor_font = xcb_generate_id (dpy); -+ xcb_open_font (dpy, cursor_font, strlen ("cursor"), "cursor"); -+ } - --/* -- * Other_stuff: A group of routines which do common X11 tasks. -- * -- * Written by Mark Lillibridge. Last updated 7/1/87 -- */ -+ cursor = xcb_generate_id (dpy); -+ xcb_create_glyph_cursor (dpy, cursor, cursor_font, cursor_font, -+ glyph, glyph + 1, -+ 0, 0, 0, 0xffff, 0xffff, 0xffff); /* rgb, rgb */ - -+ return cursor; -+} - - /* - * Routine to let user select a window using the mouse - */ - --Window Select_Window (Display *dpy, int descend) -+xcb_window_t Select_Window(xcb_connection_t *dpy, -+ const xcb_screen_t *screen, -+ int descend) - { -- int status; -- Cursor cursor; -- XEvent event; -- Window target_win = None, root = RootWindow (dpy,screen); -+ xcb_cursor_t cursor; -+ xcb_generic_event_t *event; -+ xcb_window_t target_win = XCB_WINDOW_NONE; -+ xcb_window_t root = screen->root; - int buttons = 0; -+ xcb_generic_error_t *err; -+ xcb_grab_pointer_cookie_t grab_cookie; -+ xcb_grab_pointer_reply_t *grab_reply; - - /* Make the target cursor */ -- cursor = XCreateFontCursor (dpy, XC_crosshair); -+ cursor = Create_Font_Cursor (dpy, XC_crosshair); - - /* Grab the pointer using target cursor, letting it room all over */ -- status = XGrabPointer (dpy, root, False, -- ButtonPressMask|ButtonReleaseMask, GrabModeSync, -- GrabModeAsync, root, cursor, CurrentTime); -- if (status != GrabSuccess) Fatal_Error ("Can't grab the mouse."); -+ grab_cookie = xcb_grab_pointer -+ (dpy, False, root, -+ XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE, -+ XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, -+ root, cursor, XCB_TIME_CURRENT_TIME); -+ grab_reply = xcb_grab_pointer_reply (dpy, grab_cookie, &err); -+ if (grab_reply->status != XCB_GRAB_STATUS_SUCCESS) -+ Fatal_Error ("Can't grab the mouse."); - - /* Let the user select a window... */ -- while ((target_win == None) || (buttons != 0)) { -+ while ((target_win == XCB_WINDOW_NONE) || (buttons != 0)) { - /* allow one more event */ -- XAllowEvents (dpy, SyncPointer, CurrentTime); -- XWindowEvent (dpy, root, ButtonPressMask|ButtonReleaseMask, &event); -- switch (event.type) { -- case ButtonPress: -- if (target_win == None) { -- target_win = event.xbutton.subwindow; /* window selected */ -- if (target_win == None) target_win = root; -+ xcb_allow_events (dpy, XCB_ALLOW_SYNC_POINTER, XCB_TIME_CURRENT_TIME); -+ xcb_flush (dpy); -+ event = xcb_wait_for_event (dpy); -+ switch (event->response_type & 0x7f) { -+ case XCB_BUTTON_PRESS: -+ { -+ xcb_button_press_event_t *bp = (xcb_button_press_event_t *)event; -+ -+ if (target_win == XCB_WINDOW_NONE) { -+ target_win = bp->child; /* window selected */ -+ if (target_win == XCB_WINDOW_NONE) -+ target_win = root; - } - buttons++; - break; -- case ButtonRelease: -+ } -+ case XCB_BUTTON_RELEASE: - if (buttons > 0) /* there may have been some down before we started */ - buttons--; - break; -+ default: -+ /* just discard all other events */ -+ break; - } -+ free (event); - } - -- XUngrabPointer (dpy, CurrentTime); /* Done with pointer */ -+ xcb_ungrab_pointer (dpy, XCB_TIME_CURRENT_TIME); /* Done with pointer */ - - if (!descend || (target_win == root)) - return (target_win); -@@ -285,36 +224,104 @@ Window Select_Window (Display *dpy, int descend) - * one found will be returned. Only top and its subwindows - * are looked at. Normally, top should be the RootWindow. - */ --Window Window_With_Name ( -- Display *dpy, -- Window top, -- char *name) -+ -+struct wininfo_cookies { -+ xcb_get_property_cookie_t get_wm_name; -+ xcb_query_tree_cookie_t query_tree; -+}; -+ -+static xcb_window_t -+recursive_Window_With_Name ( -+ xcb_connection_t *dpy, -+ xcb_window_t window, -+ struct wininfo_cookies *cookies, -+ const char *name) - { -- Window *children, dummy; -+ xcb_window_t *children; - unsigned int nchildren; - int i; -- Window w=0; -- char *window_name; -+ xcb_window_t w = 0; -+ xcb_generic_error_t *err; -+ xcb_get_text_property_reply_t prop; -+ xcb_query_tree_reply_t *tree; -+ struct wininfo_cookies *child_cookies; -+ -+ if (xcb_get_wm_name_reply (dpy, cookies->get_wm_name, &prop, &err)) { -+ /* can't use strcmp, since prop.name is not null terminated */ -+ if (strncmp (prop.name, name, prop.name_len) == 0) { -+ w = window; -+ } -+ -+ xcb_get_text_property_reply_wipe (&prop); - -- if (XFetchName (dpy, top, &window_name) && !strcmp (window_name, name)) -- return (top); -+ if (w) -+ { -+ xcb_discard_reply (dpy, cookies->query_tree.sequence); -+ return w; -+ } -+ } else if (err) { -+ if (err->response_type == 0) -+ Print_X_Error (dpy, err); -+ return 0; -+ } - -- if (!XQueryTree (dpy, top, &dummy, &dummy, &children, &nchildren)) -- return (0); -+ tree = xcb_query_tree_reply (dpy, cookies->query_tree, &err); -+ if (!tree) { -+ if (err->response_type == 0) -+ Print_X_Error (dpy, err); -+ return 0; -+ } -+ -+ nchildren = xcb_query_tree_children_length (tree); -+ children = xcb_query_tree_children (tree); -+ child_cookies = calloc(nchildren, sizeof(struct wininfo_cookies)); -+ -+ if (child_cookies == NULL) -+ Fatal_Error("Failed to allocate memory in recursive_Window_With_Name"); -+ -+ for (i = 0; i < nchildren; i++) { -+ child_cookies[i].get_wm_name = xcb_get_wm_name (dpy, children[i]); -+ child_cookies[i].query_tree = xcb_query_tree (dpy, children[i]); -+ } -+ xcb_flush (dpy); - - for (i = 0; i < nchildren; i++) { -- w = Window_With_Name (dpy, children[i], name); -+ w = recursive_Window_With_Name (dpy, children[i], -+ &child_cookies[i], name); - if (w) - break; - } -- if (children) XFree ((char *)children); -+ -+ if (w) -+ { -+ /* clean up remaining replies */ -+ for (/* keep previous i */; i < nchildren; i++) { -+ xcb_discard_reply (dpy, child_cookies[i].get_wm_name.sequence); -+ xcb_discard_reply (dpy, child_cookies[i].query_tree.sequence); -+ } -+ } -+ -+ free (child_cookies); -+ free (tree); /* includes storage for children[] */ - return (w); - } - -+xcb_window_t -+Window_With_Name ( -+ xcb_connection_t *dpy, -+ xcb_window_t top, -+ const char *name) -+{ -+ struct wininfo_cookies cookies; -+ -+ cookies.get_wm_name = xcb_get_wm_name (dpy, top); -+ cookies.query_tree = xcb_query_tree (dpy, top); -+ return recursive_Window_With_Name(dpy, top, &cookies, name); -+} -+ - - /* - * Standard fatal error routine - call like printf -- * Does not require dpy or screen defined. - */ - void Fatal_Error (char *msg, ...) - { -@@ -326,6 +333,127 @@ void Fatal_Error (char *msg, ...) - vfprintf (stderr, msg, args); - va_end (args); - fprintf (stderr, "\n"); -- Close_Display (); - exit (EXIT_FAILURE); - } -+ -+/* -+ * Print X error information like the default Xlib error handler -+ */ -+void -+Print_X_Error ( -+ xcb_connection_t *dpy, -+ xcb_generic_error_t *err -+ ) -+{ -+ char buffer[256] = ""; -+ -+ if ((err == NULL) || (err->response_type != 0)) /* not an error */ -+ return; -+ -+ /* Todo: find a more user friendly way to show request/extension info */ -+ if (err->error_code >= 128) -+ { -+ fprintf (stderr, "X Extension Error: Error code %d\n", -+ err->error_code); -+ } -+ else -+ { -+ switch (err->error_code) -+ { -+ case XCB_REQUEST: -+ snprintf (buffer, sizeof(buffer), ": Bad Request"); -+ break; -+ -+ case XCB_VALUE: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Value: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_WINDOW: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Window: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_PIXMAP: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Pixmap: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_ATOM: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Atom: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_CURSOR: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Cursor: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_FONT: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Font: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_MATCH: -+ snprintf (buffer, sizeof(buffer), ": Bad Match"); -+ break; -+ -+ case XCB_DRAWABLE: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Drawable: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_ACCESS: -+ snprintf (buffer, sizeof(buffer), ": Access Denied"); -+ break; -+ -+ case XCB_ALLOC: -+ snprintf (buffer, sizeof(buffer), -+ ": Server Memory Allocation Failure"); -+ break; -+ -+ case XCB_COLORMAP: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Color: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_G_CONTEXT: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad GC: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_ID_CHOICE: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad XID: 0x%x", err->resource_id); -+ break; -+ -+ case XCB_NAME: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Name"); -+ break; -+ -+ case XCB_LENGTH: -+ snprintf (buffer, sizeof(buffer), -+ ": Bad Request Length"); -+ break; -+ -+ case XCB_IMPLEMENTATION: -+ snprintf (buffer, sizeof(buffer), -+ ": Server Implementation Failure"); -+ break; -+ -+ default: -+ snprintf (buffer, sizeof(buffer), ": Unknown error"); -+ break; -+ } -+ fprintf (stderr, "X Error: %d%s\n", err->error_code, buffer); -+ } -+ -+ fprintf (stderr, " Request Major code: %d\n", err->major_code); -+ if (err->major_code >= 128) -+ { -+ fprintf (stderr, " Request Minor code: %d\n", err->minor_code); -+ } -+ -+ fprintf (stderr, " Request serial number: %d\n", err->full_sequence); -+} -diff --git a/dsimple.h b/dsimple.h -index b0d76a5..1a689e0 100644 ---- a/dsimple.h -+++ b/dsimple.h -@@ -27,55 +27,33 @@ from The Open Group. - */ - - /* -- * Just_display.h: This file contains the definitions needed to use the -- * functions in just_display.c. It also declares the global -- * variables dpy, screen, and program_name which are needed to -- * use just_display.c. -+ * dsimple.h: This file contains the definitions needed to use the -+ * functions in dsimple.c. It also declares the global -+ * variable program_name which is needed to use dsimple.c. - * -- * Written by Mark Lillibridge. Last updated 7/1/87 -- * -- * Send bugs, etc. to chariot@athena.mit.edu. -+ * Written by Mark Lillibridge for Xlib. Last updated 7/1/87 -+ * Ported to XCB over two decades later. - */ - - #include -+#include -+#include - -- /* Simple helper macros */ --#ifndef MAX --#define MAX(a,b) (((a)>(b))?(a):(b)) --#endif /* MAX */ --#ifndef MIN --#define MIN(a,b) (((a)<(b))?(a):(b)) --#endif /* MIN */ -+typedef enum { False = 0, True } Bool; - - /* Global variables used by routines in dsimple.c */ - - extern char *program_name; /* Name of this program */ --extern Display *dpy; /* The current display */ --extern int screen; /* The current screen */ -- --#define INIT_NAME program_name=argv[0] /* use this in main to setup -- program_name */ - -- /* Declaritions for functions in dsimple.c */ -+ /* Declarations for functions in dsimple.c */ - --char *Get_Display_Name(int *, char **); --Display *Open_Display(char *); --void Setup_Display_And_Screen(int *, char **); --void Close_Display(void); --Window Select_Window_Args(int *, char **); --void usage(void); -+const char *Get_Display_Name (const char *displayname); -+void Setup_Display_And_Screen (const char *displayname, -+ xcb_connection_t **dpy, xcb_screen_t **screen); - --#define X_USAGE "[host:display]" /* X arguments handled by -- Get_Display_Name */ -- --/* -- * Other_stuff.h: Definitions of routines in other_stuff. -- * -- * Written by Mark Lillibridge. Last updated 7/1/87 -- * -- * Send bugs, etc. to chariot@athena.mit.edu. -- */ -+xcb_window_t Select_Window(xcb_connection_t *, const xcb_screen_t *, int); -+xcb_window_t Window_With_Name(xcb_connection_t *, xcb_window_t, const char *); - --Window Select_Window(Display *, int); --Window Window_With_Name(Display *, Window, char *); - void Fatal_Error(char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2); -+ -+void Print_X_Error (xcb_connection_t *, xcb_generic_error_t *); -diff --git a/xwininfo.c b/xwininfo.c -index 6b2f728..ea1de2d 100644 ---- a/xwininfo.c -+++ b/xwininfo.c -@@ -1,5 +1,5 @@ - /* -- * Copyright © 1999 Sun Microsystems, Inc. All rights reserved. -+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), -@@ -64,14 +64,16 @@ of the copyright holder. - */ - - #include "config.h" --#include --#include --#include --#include --#include --#include -+ -+#include -+#include -+#include -+#include -+ - #include - #include -+#include -+#include - - /* Include routines to handle parsing defaults */ - #include "dsimple.h" -@@ -81,29 +83,54 @@ typedef struct { - const char *name; - } binding; - --static void scale_init (void); -+/* Information we keep track of for each window to allow prefetching/reusing */ -+struct wininfo { -+ xcb_window_t window; -+ -+ /* cookies for requests we've sent */ -+ xcb_get_geometry_cookie_t geometry_cookie; -+ xcb_get_property_cookie_t wm_name_cookie; -+ xcb_get_property_cookie_t wm_class_cookie; -+ xcb_translate_coordinates_cookie_t trans_coords_cookie; -+ xcb_query_tree_cookie_t tree_cookie; -+ xcb_get_window_attributes_cookie_t attr_cookie; -+ xcb_get_property_cookie_t normal_hints_cookie; -+ xcb_get_property_cookie_t hints_cookie; -+ xcb_get_property_cookie_t zoom_cookie; -+ -+ /* cached results from previous requests */ -+ xcb_get_geometry_reply_t * geometry; -+ xcb_get_window_attributes_reply_t * win_attributes; -+ xcb_size_hints_t * normal_hints; -+}; -+ -+static void scale_init (xcb_screen_t *scrn); - static char *nscale (int, int, int, char *, size_t); - static char *xscale (int); - static char *yscale (int); - static char *bscale (int); --static int bad_window_handler (Display *, XErrorEvent *); - int main (int, char **); - static const char *LookupL (long, const binding *); - static const char *Lookup (int, const binding *); --static void Display_Window_Id (Window, int); --static void Display_Stats_Info (Window); --static void Display_Bits_Info (Window); -+static void Display_Window_Id (struct wininfo *, Bool); -+static void Display_Stats_Info (struct wininfo *); -+static void Display_Bits_Info (struct wininfo *); - static void Display_Event_Mask (long); --static void Display_Events_Info (Window); --static void Display_Tree_Info (Window, int); --static void display_tree_info_1 (Window, int, int); --static void Display_Hints (XSizeHints *); --static void Display_Size_Hints (Window); --static void Display_Window_Shape (Window); --static void Display_WM_Info (Window); -+static void Display_Events_Info (struct wininfo *); -+static void Display_Tree_Info (struct wininfo *, int); -+static void display_tree_info_1 (struct wininfo *, int, int); -+static void Display_Hints (xcb_size_hints_t *); -+static void Display_Size_Hints (struct wininfo *); -+static void Display_Window_Shape (xcb_window_t); -+static void Display_WM_Info (struct wininfo *); -+static void wininfo_wipe (struct wininfo *); - - static const char *window_id_format = "0x%lx"; - -+static xcb_connection_t *dpy; -+static xcb_screen_t *screen; -+static xcb_generic_error_t *err; -+ - #ifndef HAVE_STRLCAT - static size_t strlcat (char *dst, const char *src, size_t dstsize) - { -@@ -164,19 +191,18 @@ usage (void) - * - */ - --#define getdsp(var,fn) var = fn (dpy, DefaultScreen (dpy)) - static int xp = 0, xmm = 0; - static int yp = 0, ymm = 0; - static int bp = 0, bmm = 0; - static int english = 0, metric = 0; - - static void --scale_init (void) -+scale_init (xcb_screen_t *screen) - { -- getdsp (yp, DisplayHeight); -- getdsp (ymm, DisplayHeightMM); -- getdsp (xp, DisplayWidth); -- getdsp (xmm, DisplayWidthMM); -+ xp = screen->width_in_pixels; -+ yp = screen->height_in_pixels; -+ xmm = screen->width_in_millimeters; -+ ymm = screen->height_in_millimeters; - bp = xp + yp; - bmm = xmm + ymm; - } -@@ -250,9 +276,6 @@ static char xbuf[BUFSIZ]; - static char * - xscale (int x) - { -- if (!xp) { -- scale_init (); -- } - return (nscale (x, xp, xmm, xbuf, sizeof(xbuf))); - } - -@@ -260,9 +283,6 @@ static char ybuf[BUFSIZ]; - static char * - yscale (int y) - { -- if (!yp) { -- scale_init (); -- } - return (nscale (y, yp, ymm, ybuf, sizeof(ybuf))); - } - -@@ -270,53 +290,57 @@ static char bbuf[BUFSIZ]; - static char * - bscale (int b) - { -- if (!bp) { -- scale_init (); -- } - return (nscale (b, bp, bmm, bbuf, sizeof(bbuf))); - } - - /* end of pixel to inch, metric converter */ - --/* This handler is enabled when we are checking -- to see if the -id the user specified is valid. */ -- --/* ARGSUSED */ --static int --bad_window_handler (Display *disp, XErrorEvent *err) --{ -- char badid[20]; -- -- snprintf (badid, sizeof(badid), window_id_format, err->resourceid); -- Fatal_Error ("No such window with id %s.", badid); -- exit (1); -- return 0; --} -- -- - int - main (int argc, char **argv) - { - register int i; - int tree = 0, stats = 0, bits = 0, events = 0, wm = 0, size = 0, shape = 0; - int frame = 0, children = 0; -- Window window; -+ int use_root = 0; -+ xcb_window_t window = 0; -+ char *display_name = NULL; -+ const char *window_name = NULL; -+ struct wininfo wininfo; -+ struct wininfo *w = &wininfo; - -- INIT_NAME; -+ program_name = argv[0]; - - if (!setlocale (LC_ALL, "")) - fprintf (stderr, "%s: can not set locale properly\n", program_name); - -- /* Open display, handle command line arguments */ -- Setup_Display_And_Screen (&argc, argv); -- -- /* Get window selected on command line, if any */ -- window = Select_Window_Args (&argc, argv); -+ memset (w, 0, sizeof(struct wininfo)); - - /* Handle our command line arguments */ - for (i = 1; i < argc; i++) { - if (!strcmp (argv[i], "-help")) - usage (); -+ if (!strcmp (argv[i], "-display") || !strcmp (argv[i], "-d")) { -+ if (++i >= argc) -+ Fatal_Error("-display requires argument"); -+ display_name = argv[i]; -+ continue; -+ } -+ if (!strcmp (argv[i], "-root")) { -+ use_root = 1; -+ continue; -+ } -+ if (!strcmp (argv[i], "-id")) { -+ if (++i >= argc) -+ Fatal_Error("-id requires argument"); -+ window = strtoul(argv[i], NULL, 0); -+ continue; -+ } -+ if (!strcmp (argv[i], "-name")) { -+ if (++i >= argc) -+ Fatal_Error("-name requires argument"); -+ window_name = argv[i]; -+ continue; -+ } - if (!strcmp (argv[i], "-int")) { - window_id_format = "%ld"; - continue; -@@ -372,13 +396,26 @@ main (int argc, char **argv) - usage (); - } - -+ Setup_Display_And_Screen (display_name, &dpy, &screen); -+ -+ /* initialize scaling data */ -+ scale_init(screen); -+ -+ if (use_root) -+ window = screen->root; -+ else if (window_name) { -+ window = Window_With_Name (dpy, screen->root, window_name); -+ if (!window) -+ Fatal_Error ("No window with name \"%s\" exists!", window_name); -+ } -+ - /* If no window selected on command line, let user pick one the hard way */ - if (!window) { - printf ("\n" - "xwininfo: Please select the window about which you\n" - " would like information by clicking the\n" - " mouse in that window.\n"); -- window = Select_Window (dpy, !frame); -+ window = Select_Window (dpy, screen, !frame); - } - - /* -@@ -391,37 +428,102 @@ main (int argc, char **argv) - * make sure that the window is valid - */ - { -- Window root; -- int x, y; -- unsigned width, height, bw, depth; -- XErrorHandler old_handler; -- -- old_handler = XSetErrorHandler (bad_window_handler); -- XGetGeometry (dpy, window, &root, &x, &y, &width, &height, &bw, &depth); -- XSync (dpy, False); -- (void) XSetErrorHandler (old_handler); -+ xcb_get_geometry_cookie_t gg_cookie = -+ xcb_get_geometry (dpy, window); -+ -+ w->geometry = xcb_get_geometry_reply(dpy, gg_cookie, &err); -+ -+ if (!w->geometry) { -+ char badid[20]; -+ -+ if (err) -+ Print_X_Error (dpy, err); -+ -+ snprintf (badid, sizeof(badid), window_id_format, window); -+ Fatal_Error ("No such window with id %s.", badid); -+ } - } - -+ /* Send requests to prefetch data we'll need */ -+ w->window = window; -+ w->wm_name_cookie = xcb_get_wm_name (dpy, window); -+ if (children || tree) -+ w->tree_cookie = xcb_query_tree (dpy, window); -+ if (stats) { -+ w->trans_coords_cookie = -+ xcb_translate_coordinates (dpy, window, w->geometry->root, -+ -(w->geometry->border_width), -+ -(w->geometry->border_width)); -+ } -+ if (stats || bits || events) -+ w->attr_cookie = xcb_get_window_attributes (dpy, window); -+ if (stats || size) -+ w->normal_hints_cookie = xcb_get_wm_normal_hints (dpy, window); -+ if (wm) -+ w->hints_cookie = xcb_get_wm_hints(dpy, window); -+ if (size) -+ w->zoom_cookie = xcb_get_wm_size_hints (dpy, window, -+ XCB_ATOM_WM_ZOOM_HINTS); -+ xcb_flush (dpy); -+ - printf ("\nxwininfo: Window id: "); -- Display_Window_Id (window, True); -+ Display_Window_Id (w, True); - if (children || tree) -- Display_Tree_Info (window, tree); -+ Display_Tree_Info (w, tree); - if (stats) -- Display_Stats_Info (window); -+ Display_Stats_Info (w); - if (bits) -- Display_Bits_Info (window); -+ Display_Bits_Info (w); - if (events) -- Display_Events_Info (window); -+ Display_Events_Info (w); - if (wm) -- Display_WM_Info (window); -+ Display_WM_Info (w); - if (size) -- Display_Size_Hints (window); -+ Display_Size_Hints (w); - if (shape) - Display_Window_Shape (window); - printf ("\n"); -+ -+ wininfo_wipe (w); -+ xcb_disconnect (dpy); - exit (0); - } - -+/* Ensure win_attributes field is filled in */ -+static xcb_get_window_attributes_reply_t * -+fetch_win_attributes (struct wininfo *w) -+{ -+ if (!w->win_attributes) { -+ w->win_attributes = -+ xcb_get_window_attributes_reply (dpy, w->attr_cookie, &err); -+ -+ if (!w->win_attributes) { -+ Print_X_Error (dpy, err); -+ Fatal_Error ("Can't get window attributes."); -+ } -+ } -+ return w->win_attributes; -+} -+ -+/* Ensure normal_hints field is filled in */ -+static xcb_size_hints_t * -+fetch_normal_hints (struct wininfo *w, xcb_size_hints_t *hints_return) -+{ -+ xcb_size_hints_t hints; -+ -+ if (!w->normal_hints) { -+ if (xcb_get_wm_normal_hints_reply (dpy, w->normal_hints_cookie, -+ &hints, NULL)) { -+ w->normal_hints = malloc (sizeof(xcb_size_hints_t)); -+ if (w->normal_hints) -+ memcpy(w->normal_hints, &hints, sizeof(xcb_size_hints_t)); -+ } -+ } -+ if (hints_return && w->normal_hints) -+ memcpy(hints_return, w->normal_hints, sizeof(xcb_size_hints_t)); -+ return w->normal_hints; -+} -+ - - /* - * Lookup: lookup a code in a table. -@@ -458,41 +560,37 @@ Lookup (int code, const binding *table) - - /* - * Routine to display a window id in dec/hex with name if window has one -+ * -+ * Requires wininfo members initialized: window, wm_name_cookie - */ - - static void --Display_Window_Id (Window window, Bool newline_wanted) -+Display_Window_Id (struct wininfo *w, Bool newline_wanted) - { -- XTextProperty tp; -+ xcb_get_text_property_reply_t prop; -+ uint8_t got_reply; - -- printf (window_id_format, window); /* print id # in hex/dec */ -+ printf (window_id_format, w->window); /* print id # in hex/dec */ - -- if (!window) { -+ if (!w->window) { - printf (" (none)"); - } else { -- if (window == RootWindow (dpy, screen)) { -+ if (w->window == screen->root) { - printf (" (the root window)"); - } -- if (!XGetWMName (dpy, window, &tp)) { /* Get window name if any */ -+ /* Get window name if any */ -+ got_reply = xcb_get_wm_name_reply (dpy, w->wm_name_cookie, -+ &prop, NULL); -+ if (!got_reply || prop.name_len == 0) { - printf (" (has no name)"); -- } else if (tp.nitems > 0) { -+ } else { - printf (" \""); -- { -- int count = 0, i, ret; -- char **list = NULL; -- ret = XmbTextPropertyToTextList (dpy, &tp, &list, &count); -- if ((ret == Success || ret > 0) && list != NULL){ -- for (i = 0; i < count; i++) -- printf ("%s", list[i]); -- XFreeStringList (list); -- } else { -- printf ("%s", tp.value); -- } -- } -+ /* XXX: need to handle encoding */ -+ printf ("%.*s", prop.name_len, prop.name); - printf ("\""); - } -- else -- printf (" (has no name)"); -+ if (got_reply) -+ xcb_get_text_property_reply_wipe (&prop); - } - - if (newline_wanted) -@@ -506,211 +604,244 @@ Display_Window_Id (Window window, Bool newline_wanted) - * Display Stats on window - */ - static const binding _window_classes[] = { -- { InputOutput, "InputOutput" }, -- { InputOnly, "InputOnly" }, -+ { XCB_WINDOW_CLASS_INPUT_OUTPUT, "InputOutput" }, -+ { XCB_WINDOW_CLASS_INPUT_ONLY, "InputOnly" }, - { 0, NULL } }; - - static const binding _map_states[] = { -- { IsUnmapped, "IsUnMapped" }, -- { IsUnviewable, "IsUnviewable" }, -- { IsViewable, "IsViewable" }, -+ { XCB_MAP_STATE_UNMAPPED, "IsUnMapped" }, -+ { XCB_MAP_STATE_UNVIEWABLE, "IsUnviewable" }, -+ { XCB_MAP_STATE_VIEWABLE, "IsViewable" }, - { 0, NULL } }; - - static const binding _backing_store_states[] = { -- { NotUseful, "NotUseful" }, -- { WhenMapped, "WhenMapped" }, -- { Always, "Always" }, -+ { XCB_BACKING_STORE_NOT_USEFUL, "NotUseful" }, -+ { XCB_BACKING_STORE_WHEN_MAPPED,"WhenMapped" }, -+ { XCB_BACKING_STORE_ALWAYS, "Always" }, - { 0, NULL } }; - - static const binding _bit_gravity_states[] = { -- { ForgetGravity, "ForgetGravity" }, -- { NorthWestGravity, "NorthWestGravity" }, -- { NorthGravity, "NorthGravity" }, -- { NorthEastGravity, "NorthEastGravity" }, -- { WestGravity, "WestGravity" }, -- { CenterGravity, "CenterGravity" }, -- { EastGravity, "EastGravity" }, -- { SouthWestGravity, "SouthWestGravity" }, -- { SouthGravity, "SouthGravity" }, -- { SouthEastGravity, "SouthEastGravity" }, -- { StaticGravity, "StaticGravity" }, -+ { XCB_GRAVITY_BIT_FORGET, "ForgetGravity" }, -+ { XCB_GRAVITY_NORTH_WEST, "NorthWestGravity" }, -+ { XCB_GRAVITY_NORTH, "NorthGravity" }, -+ { XCB_GRAVITY_NORTH_EAST, "NorthEastGravity" }, -+ { XCB_GRAVITY_WEST, "WestGravity" }, -+ { XCB_GRAVITY_CENTER, "CenterGravity" }, -+ { XCB_GRAVITY_EAST, "EastGravity" }, -+ { XCB_GRAVITY_SOUTH_WEST, "SouthWestGravity" }, -+ { XCB_GRAVITY_SOUTH, "SouthGravity" }, -+ { XCB_GRAVITY_SOUTH_EAST, "SouthEastGravity" }, -+ { XCB_GRAVITY_STATIC, "StaticGravity" }, - { 0, NULL }}; - - static const binding _window_gravity_states[] = { -- { UnmapGravity, "UnmapGravity" }, -- { NorthWestGravity, "NorthWestGravity" }, -- { NorthGravity, "NorthGravity" }, -- { NorthEastGravity, "NorthEastGravity" }, -- { WestGravity, "WestGravity" }, -- { CenterGravity, "CenterGravity" }, -- { EastGravity, "EastGravity" }, -- { SouthWestGravity, "SouthWestGravity" }, -- { SouthGravity, "SouthGravity" }, -- { SouthEastGravity, "SouthEastGravity" }, -- { StaticGravity, "StaticGravity" }, -+ { XCB_GRAVITY_WIN_UNMAP, "UnmapGravity" }, -+ { XCB_GRAVITY_NORTH_WEST, "NorthWestGravity" }, -+ { XCB_GRAVITY_NORTH, "NorthGravity" }, -+ { XCB_GRAVITY_NORTH_EAST, "NorthEastGravity" }, -+ { XCB_GRAVITY_WEST, "WestGravity" }, -+ { XCB_GRAVITY_CENTER, "CenterGravity" }, -+ { XCB_GRAVITY_EAST, "EastGravity" }, -+ { XCB_GRAVITY_SOUTH_WEST, "SouthWestGravity" }, -+ { XCB_GRAVITY_SOUTH, "SouthGravity" }, -+ { XCB_GRAVITY_SOUTH_EAST, "SouthEastGravity" }, -+ { XCB_GRAVITY_STATIC, "StaticGravity" }, - { 0, NULL }}; - - static const binding _visual_classes[] = { -- { StaticGray, "StaticGray" }, -- { GrayScale, "GrayScale" }, -- { StaticColor, "StaticColor" }, -- { PseudoColor, "PseudoColor" }, -- { TrueColor, "TrueColor" }, -- { DirectColor, "DirectColor" }, -+ { XCB_VISUAL_CLASS_STATIC_GRAY, "StaticGray" }, -+ { XCB_VISUAL_CLASS_GRAY_SCALE, "GrayScale" }, -+ { XCB_VISUAL_CLASS_STATIC_COLOR,"StaticColor" }, -+ { XCB_VISUAL_CLASS_PSEUDO_COLOR,"PseudoColor" }, -+ { XCB_VISUAL_CLASS_TRUE_COLOR, "TrueColor" }, -+ { XCB_VISUAL_CLASS_DIRECT_COLOR,"DirectColor" }, - { 0, NULL }}; - -+/* -+ * Requires wininfo members initialized: -+ * window, geometry, attr_cookie, trans_coords_cookie, normal_hints_cookie -+ */ - static void --Display_Stats_Info (Window window) -+Display_Stats_Info (struct wininfo *w) - { -- XWindowAttributes win_attributes; -- XVisualInfo vistemplate, *vinfo; -- XSizeHints hints; -- int dw = DisplayWidth (dpy, screen), dh = DisplayHeight (dpy, screen); -+ xcb_translate_coordinates_reply_t *trans_coords; -+ xcb_get_window_attributes_reply_t *win_attributes; -+ xcb_size_hints_t hints; -+ -+ int dw = screen->width_in_pixels, dh = screen->height_in_pixels; - int rx, ry, xright, ybelow; - int showright = 0, showbelow = 0; -- Status status; -- Window wmframe; -- int junk; -- long longjunk; -- Window junkwin; -- -- if (!XGetWindowAttributes (dpy, window, &win_attributes)) -- Fatal_Error ("Can't get window attributes."); -- vistemplate.visualid = XVisualIDFromVisual (win_attributes.visual); -- vinfo = XGetVisualInfo (dpy, VisualIDMask, &vistemplate, &junk); -- -- (void) XTranslateCoordinates (dpy, window, win_attributes.root, -- -win_attributes.border_width, -- -win_attributes.border_width, -- &rx, &ry, &junkwin); -- -- xright = (dw - rx - win_attributes.border_width * 2 - -- win_attributes.width); -- ybelow = (dh - ry - win_attributes.border_width * 2 - -- win_attributes.height); -+ xcb_window_t wmframe, parent; -+ -+ trans_coords = -+ xcb_translate_coordinates_reply (dpy, w->trans_coords_cookie, NULL); -+ if (!trans_coords) -+ Fatal_Error ("Can't get translated coordinates."); -+ -+ rx = trans_coords->dst_x; -+ ry = trans_coords->dst_y; -+ free (trans_coords); -+ -+ xright = (dw - rx - w->geometry->border_width * 2 - -+ w->geometry->width); -+ ybelow = (dh - ry - w->geometry->border_width * 2 - -+ w->geometry->height); -+ - - printf ("\n"); - printf (" Absolute upper-left X: %s\n", xscale (rx)); - printf (" Absolute upper-left Y: %s\n", yscale (ry)); -- printf (" Relative upper-left X: %s\n", xscale (win_attributes.x)); -- printf (" Relative upper-left Y: %s\n", yscale (win_attributes.y)); -- printf (" Width: %s\n", xscale (win_attributes.width)); -- printf (" Height: %s\n", yscale (win_attributes.height)); -- printf (" Depth: %d\n", win_attributes.depth); -- printf (" Visual: 0x%lx\n", vinfo->visualid); -- printf (" Visual Class: %s\n", Lookup (vinfo->class, _visual_classes)); -- printf (" Border width: %s\n", bscale (win_attributes.border_width)); -+ printf (" Relative upper-left X: %s\n", xscale (w->geometry->x)); -+ printf (" Relative upper-left Y: %s\n", yscale (w->geometry->y)); -+ printf (" Width: %s\n", xscale (w->geometry->width)); -+ printf (" Height: %s\n", yscale (w->geometry->height)); -+ printf (" Depth: %d\n", w->geometry->depth); -+ -+ win_attributes = fetch_win_attributes (w); -+ -+ printf (" Visual: 0x%lx\n", (unsigned long) win_attributes->visual); -+ if (screen) -+ { -+ xcb_depth_iterator_t depth_iter; -+ xcb_visualtype_t *visual_type = NULL; -+ -+ depth_iter = xcb_screen_allowed_depths_iterator (screen); -+ for (; depth_iter.rem; xcb_depth_next (&depth_iter)) { -+ xcb_visualtype_iterator_t visual_iter; -+ -+ visual_iter = xcb_depth_visuals_iterator (depth_iter.data); -+ for (; visual_iter.rem; xcb_visualtype_next (&visual_iter)) { -+ if (screen->root_visual == visual_iter.data->visual_id) { -+ visual_type = visual_iter.data; -+ break; -+ } -+ } -+ } -+ if (visual_type) -+ printf (" Visual Class: %s\n", Lookup (visual_type->_class, -+ _visual_classes)); -+ } -+ -+ printf (" Border width: %s\n", bscale (w->geometry->border_width)); - printf (" Class: %s\n", -- Lookup (win_attributes.class, _window_classes)); -+ Lookup (win_attributes->_class, _window_classes)); - printf (" Colormap: 0x%lx (%sinstalled)\n", -- win_attributes.colormap, -- win_attributes.map_installed ? "" : "not "); -+ (unsigned long) win_attributes->colormap, -+ win_attributes->map_is_installed ? "" : "not "); - printf (" Bit Gravity State: %s\n", -- Lookup (win_attributes.bit_gravity, _bit_gravity_states)); -+ Lookup (win_attributes->bit_gravity, _bit_gravity_states)); - printf (" Window Gravity State: %s\n", -- Lookup (win_attributes.win_gravity, _window_gravity_states)); -+ Lookup (win_attributes->win_gravity, _window_gravity_states)); - printf (" Backing Store State: %s\n", -- Lookup (win_attributes.backing_store, _backing_store_states)); -+ Lookup (win_attributes->backing_store, _backing_store_states)); - printf (" Save Under State: %s\n", -- win_attributes.save_under ? "yes" : "no"); -+ win_attributes->save_under ? "yes" : "no"); - printf (" Map State: %s\n", -- Lookup (win_attributes.map_state, _map_states)); -+ Lookup (win_attributes->map_state, _map_states)); - printf (" Override Redirect State: %s\n", -- win_attributes.override_redirect ? "yes" : "no"); -+ win_attributes->override_redirect ? "yes" : "no"); - printf (" Corners: +%d+%d -%d+%d -%d-%d +%d-%d\n", - rx, ry, xright, ry, xright, ybelow, rx, ybelow); - -- XFree (vinfo); -- - /* - * compute geometry string that would recreate window - */ - printf (" -geometry "); - - /* compute size in appropriate units */ -- status = XGetWMNormalHints (dpy, window, &hints, &longjunk); -- if (status && hints.flags & PResizeInc && -- hints.width_inc != 0 && hints.height_inc != 0) { -- if (hints.flags & (PBaseSize|PMinSize)) { -- if (hints.flags & PBaseSize) { -- win_attributes.width -= hints.base_width; -- win_attributes.height -= hints.base_height; -+ if (!fetch_normal_hints (w, &hints)) -+ hints.flags = 0; -+ -+ if ((hints.flags & XCB_SIZE_HINT_P_RESIZE_INC) && -+ (hints.width_inc != 0) && (hints.height_inc != 0)) { -+ if (hints.flags & (XCB_SIZE_HINT_BASE_SIZE|XCB_SIZE_HINT_P_MIN_SIZE)) { -+ if (hints.flags & XCB_SIZE_HINT_BASE_SIZE) { -+ w->geometry->width -= hints.base_width; -+ w->geometry->height -= hints.base_height; - } else { - /* ICCCM says MinSize is default for BaseSize */ -- win_attributes.width -= hints.min_width; -- win_attributes.height -= hints.min_height; -+ w->geometry->width -= hints.min_width; -+ w->geometry->height -= hints.min_height; - } - } -- printf ("%dx%d", win_attributes.width/hints.width_inc, -- win_attributes.height/hints.height_inc); -+ printf ("%dx%d", w->geometry->width/hints.width_inc, -+ w->geometry->height/hints.height_inc); - } else -- printf ("%dx%d", win_attributes.width, win_attributes.height); -+ printf ("%dx%d", w->geometry->width, w->geometry->height); - -- if (!(hints.flags&PWinGravity)) -- hints.win_gravity = NorthWestGravity; /* per ICCCM */ -+ if (!(hints.flags & XCB_SIZE_HINT_P_WIN_GRAVITY)) -+ hints.win_gravity = XCB_GRAVITY_NORTH_WEST; /* per ICCCM */ - /* find our window manager frame, if any */ -- wmframe = window; -- while (True) { -- Window root, parent; -- Window *childlist; -- unsigned int ujunk; -- -- status = XQueryTree (dpy, wmframe, &root, &parent, &childlist, &ujunk); -- if (parent == root || !parent || !status) -+ for (wmframe = parent = w->window; parent != 0 ; wmframe = parent) { -+ xcb_query_tree_cookie_t qt_cookie; -+ xcb_query_tree_reply_t *tree; -+ -+ qt_cookie = xcb_query_tree (dpy, wmframe); -+ tree = xcb_query_tree_reply (dpy, qt_cookie, &err); -+ if (!tree) { -+ Print_X_Error (dpy, err); -+ Fatal_Error ("Can't query window tree."); -+ } -+ parent = tree->parent; -+ free (tree); -+ if (parent == w->geometry->root || !parent) - break; -- wmframe = parent; -- if (status && childlist) -- XFree ((char *)childlist); - } -- if (wmframe != window) { -+ if (wmframe != w->window) { - /* WM reparented, so find edges of the frame */ - /* Only works for ICCCM-compliant WMs, and then only if the - window has corner gravity. We would need to know the original width - of the window to correctly handle the other gravities. */ -+ xcb_get_geometry_cookie_t geom_cookie; -+ xcb_get_geometry_reply_t *frame_geometry; - -- XWindowAttributes frame_attr; -+ geom_cookie = xcb_get_geometry (dpy, wmframe); -+ frame_geometry = xcb_get_geometry_reply (dpy, geom_cookie, &err); - -- if (!XGetWindowAttributes (dpy, wmframe, &frame_attr)) -- Fatal_Error ("Can't get frame attributes."); -+ if (!frame_geometry) { -+ Print_X_Error (dpy, err); -+ Fatal_Error ("Can't get frame geometry."); -+ } - switch (hints.win_gravity) { -- case NorthWestGravity: case SouthWestGravity: -- case NorthEastGravity: case SouthEastGravity: -- case WestGravity: -- rx = frame_attr.x; -+ case XCB_GRAVITY_NORTH_WEST: case XCB_GRAVITY_SOUTH_WEST: -+ case XCB_GRAVITY_NORTH_EAST: case XCB_GRAVITY_SOUTH_EAST: -+ case XCB_GRAVITY_WEST: -+ rx = frame_geometry->x; - } - switch (hints.win_gravity) { -- case NorthWestGravity: case SouthWestGravity: -- case NorthEastGravity: case SouthEastGravity: -- case EastGravity: -- xright = dw - frame_attr.x - frame_attr.width - -- 2*frame_attr.border_width; -+ case XCB_GRAVITY_NORTH_WEST: case XCB_GRAVITY_SOUTH_WEST: -+ case XCB_GRAVITY_NORTH_EAST: case XCB_GRAVITY_SOUTH_EAST: -+ case XCB_GRAVITY_EAST: -+ xright = dw - frame_geometry->x - frame_geometry->width - -+ (2 * frame_geometry->border_width); - } - switch (hints.win_gravity) { -- case NorthWestGravity: case SouthWestGravity: -- case NorthEastGravity: case SouthEastGravity: -- case NorthGravity: -- ry = frame_attr.y; -+ case XCB_GRAVITY_NORTH_WEST: case XCB_GRAVITY_SOUTH_WEST: -+ case XCB_GRAVITY_NORTH_EAST: case XCB_GRAVITY_SOUTH_EAST: -+ case XCB_GRAVITY_NORTH: -+ ry = frame_geometry->y; - } - switch (hints.win_gravity) { -- case NorthWestGravity: case SouthWestGravity: -- case NorthEastGravity: case SouthEastGravity: -- case SouthGravity: -- ybelow = dh - frame_attr.y - frame_attr.height - -- 2*frame_attr.border_width; -+ case XCB_GRAVITY_NORTH_WEST: case XCB_GRAVITY_SOUTH_WEST: -+ case XCB_GRAVITY_NORTH_EAST: case XCB_GRAVITY_SOUTH_EAST: -+ case XCB_GRAVITY_SOUTH: -+ ybelow = dh - frame_geometry->y - frame_geometry->height - -+ (2 * frame_geometry->border_width); - } -+ free (frame_geometry); - } - /* If edge gravity, offer a corner on that edge (because the application - programmer cares about that edge), otherwise offer upper left unless - some other corner is close to an edge of the screen. - (For corner gravity, assume gravity was set by XWMGeometry. - For CenterGravity, it doesn't matter.) */ -- if (hints.win_gravity == EastGravity || -+ if (hints.win_gravity == XCB_GRAVITY_EAST || - (abs (xright) <= 100 && abs (xright) < abs (rx) -- && hints.win_gravity != WestGravity)) -+ && hints.win_gravity != XCB_GRAVITY_WEST)) - showright = 1; -- if (hints.win_gravity == SouthGravity || -+ if (hints.win_gravity == XCB_GRAVITY_SOUTH || - (abs (ybelow) <= 100 && abs (ybelow) < abs (ry) -- && hints.win_gravity != NorthGravity)) -+ && hints.win_gravity != XCB_GRAVITY_NORTH)) - showbelow = 1; - - if (showright) -@@ -729,24 +860,25 @@ Display_Stats_Info (Window window) - * Display bits info: - */ - static const binding _gravities[] = { -- { UnmapGravity, "UnMapGravity" }, /* WARNING: both of these have*/ -- { ForgetGravity, "ForgetGravity" }, /* the same value - see code */ -- { NorthWestGravity, "NorthWestGravity" }, -- { NorthGravity, "NorthGravity" }, -- { NorthEastGravity, "NorthEastGravity" }, -- { WestGravity, "WestGravity" }, -- { CenterGravity, "CenterGravity" }, -- { EastGravity, "EastGravity" }, -- { SouthWestGravity, "SouthWestGravity" }, -- { SouthGravity, "SouthGravity" }, -- { SouthEastGravity, "SouthEastGravity" }, -- { StaticGravity, "StaticGravity" }, -+ /* WARNING: the first two of these have the same value - see code */ -+ { XCB_GRAVITY_WIN_UNMAP, "UnMapGravity" }, -+ { XCB_GRAVITY_BIT_FORGET, "ForgetGravity" }, -+ { XCB_GRAVITY_NORTH_WEST, "NorthWestGravity" }, -+ { XCB_GRAVITY_NORTH, "NorthGravity" }, -+ { XCB_GRAVITY_NORTH_EAST, "NorthEastGravity" }, -+ { XCB_GRAVITY_WEST, "WestGravity" }, -+ { XCB_GRAVITY_CENTER, "CenterGravity" }, -+ { XCB_GRAVITY_EAST, "EastGravity" }, -+ { XCB_GRAVITY_SOUTH_WEST, "SouthWestGravity" }, -+ { XCB_GRAVITY_SOUTH, "SouthGravity" }, -+ { XCB_GRAVITY_SOUTH_EAST, "SouthEastGravity" }, -+ { XCB_GRAVITY_STATIC, "StaticGravity" }, - { 0, NULL } }; - - static const binding _backing_store_hint[] = { -- { NotUseful, "NotUseful" }, -- { WhenMapped, "WhenMapped" }, -- { Always, "Always" }, -+ { XCB_BACKING_STORE_NOT_USEFUL, "NotUseful" }, -+ { XCB_BACKING_STORE_WHEN_MAPPED,"WhenMapped" }, -+ { XCB_BACKING_STORE_ALWAYS, "Always" }, - { 0, NULL } }; - - static const binding _bool[] = { -@@ -754,26 +886,29 @@ static const binding _bool[] = { - { 1, "Yes" }, - { 0, NULL } }; - -+/* -+ * Requires wininfo members initialized: -+ * window, attr_cookie (or win_attributes) -+ */ - static void --Display_Bits_Info (Window window) -+Display_Bits_Info (struct wininfo * w) - { -- XWindowAttributes win_attributes; -- -- if (!XGetWindowAttributes (dpy, window, &win_attributes)) -- Fatal_Error ("Can't get window attributes."); -+ xcb_get_window_attributes_reply_t *win_attributes -+ = fetch_win_attributes (w); - - printf ("\n"); - printf (" Bit gravity: %s\n", -- Lookup (win_attributes.bit_gravity, _gravities+1)); -+ Lookup (win_attributes->bit_gravity, _gravities+1)); - printf (" Window gravity: %s\n", -- Lookup (win_attributes.win_gravity, _gravities)); -+ Lookup (win_attributes->win_gravity, _gravities)); - printf (" Backing-store hint: %s\n", -- Lookup (win_attributes.backing_store, _backing_store_hint)); -+ Lookup (win_attributes->backing_store, _backing_store_hint)); - printf (" Backing-planes to be preserved: 0x%lx\n", -- win_attributes.backing_planes); -- printf (" Backing pixel: %ld\n", win_attributes.backing_pixel); -+ (unsigned long) win_attributes->backing_planes); -+ printf (" Backing pixel: %ld\n", -+ (unsigned long) win_attributes->backing_pixel); - printf (" Save-unders: %s\n", -- Lookup (win_attributes.save_under, _bool)); -+ Lookup (win_attributes->save_under, _bool)); - } - - -@@ -781,31 +916,31 @@ Display_Bits_Info (Window window) - * Routine to display all events in an event mask - */ - static const binding _event_mask_names[] = { -- { KeyPressMask, "KeyPress" }, -- { KeyReleaseMask, "KeyRelease" }, -- { ButtonPressMask, "ButtonPress" }, -- { ButtonReleaseMask, "ButtonRelease" }, -- { EnterWindowMask, "EnterWindow" }, -- { LeaveWindowMask, "LeaveWindow" }, -- { PointerMotionMask, "PointerMotion" }, -- { PointerMotionHintMask, "PointerMotionHint" }, -- { Button1MotionMask, "Button1Motion" }, -- { Button2MotionMask, "Button2Motion" }, -- { Button3MotionMask, "Button3Motion" }, -- { Button4MotionMask, "Button4Motion" }, -- { Button5MotionMask, "Button5Motion" }, -- { ButtonMotionMask, "ButtonMotion" }, -- { KeymapStateMask, "KeymapState" }, -- { ExposureMask, "Exposure" }, -- { VisibilityChangeMask, "VisibilityChange" }, -- { StructureNotifyMask, "StructureNotify" }, -- { ResizeRedirectMask, "ResizeRedirect" }, -- { SubstructureNotifyMask, "SubstructureNotify" }, -- { SubstructureRedirectMask, "SubstructureRedirect" }, -- { FocusChangeMask, "FocusChange" }, -- { PropertyChangeMask, "PropertyChange" }, -- { ColormapChangeMask, "ColormapChange" }, -- { OwnerGrabButtonMask, "OwnerGrabButton" }, -+ { XCB_EVENT_MASK_KEY_PRESS, "KeyPress" }, -+ { XCB_EVENT_MASK_KEY_RELEASE, "KeyRelease" }, -+ { XCB_EVENT_MASK_BUTTON_PRESS, "ButtonPress" }, -+ { XCB_EVENT_MASK_BUTTON_RELEASE, "ButtonRelease" }, -+ { XCB_EVENT_MASK_ENTER_WINDOW, "EnterWindow" }, -+ { XCB_EVENT_MASK_LEAVE_WINDOW, "LeaveWindow" }, -+ { XCB_EVENT_MASK_POINTER_MOTION, "PointerMotion" }, -+ { XCB_EVENT_MASK_POINTER_MOTION_HINT, "PointerMotionHint" }, -+ { XCB_EVENT_MASK_BUTTON_1_MOTION, "Button1Motion" }, -+ { XCB_EVENT_MASK_BUTTON_2_MOTION, "Button2Motion" }, -+ { XCB_EVENT_MASK_BUTTON_3_MOTION, "Button3Motion" }, -+ { XCB_EVENT_MASK_BUTTON_4_MOTION, "Button4Motion" }, -+ { XCB_EVENT_MASK_BUTTON_5_MOTION, "Button5Motion" }, -+ { XCB_EVENT_MASK_BUTTON_MOTION, "ButtonMotion" }, -+ { XCB_EVENT_MASK_KEYMAP_STATE, "KeymapState" }, -+ { XCB_EVENT_MASK_EXPOSURE, "Exposure" }, -+ { XCB_EVENT_MASK_VISIBILITY_CHANGE, "VisibilityChange" }, -+ { XCB_EVENT_MASK_STRUCTURE_NOTIFY, "StructureNotify" }, -+ { XCB_EVENT_MASK_RESIZE_REDIRECT, "ResizeRedirect" }, -+ { XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY, "SubstructureNotify" }, -+ { XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, "SubstructureRedirect" }, -+ { XCB_EVENT_MASK_FOCUS_CHANGE, "FocusChange" }, -+ { XCB_EVENT_MASK_PROPERTY_CHANGE, "PropertyChange" }, -+ { XCB_EVENT_MASK_COLOR_MAP_CHANGE, "ColormapChange" }, -+ { XCB_EVENT_MASK_OWNER_GRAB_BUTTON, "OwnerGrabButton" }, - { 0, NULL } }; - - static void -@@ -822,24 +957,25 @@ Display_Event_Mask (long mask) - - /* - * Display info on events -+ * -+ * Requires wininfo members initialized: -+ * window, attr_cookie (or win_attributes) - */ - static void --Display_Events_Info (Window window) -+Display_Events_Info (struct wininfo *w) - { -- XWindowAttributes win_attributes; -- -- if (!XGetWindowAttributes (dpy, window, &win_attributes)) -- Fatal_Error ("Can't get window attributes."); -+ xcb_get_window_attributes_reply_t *win_attributes -+ = fetch_win_attributes (w); - - printf ("\n"); - printf (" Someone wants these events:\n"); -- Display_Event_Mask (win_attributes.all_event_masks); -+ Display_Event_Mask (win_attributes->all_event_masks); - - printf (" Do not propagate these events:\n"); -- Display_Event_Mask (win_attributes.do_not_propagate_mask); -+ Display_Event_Mask (win_attributes->do_not_propagate_mask); - - printf (" Override redirection?: %s\n", -- Lookup (win_attributes.override_redirect, _bool)); -+ Lookup (win_attributes->override_redirect, _bool)); - } - - -@@ -851,39 +987,48 @@ Display_Events_Info (Window window) - /* - * Display root, parent, and (recursively) children information - * recurse - true to show children information -+ * -+ * Requires wininfo members initialized: window, tree_cookie - */ - static void --Display_Tree_Info (Window window, int recurse) -+Display_Tree_Info (struct wininfo *w, int recurse) - { -- display_tree_info_1 (window, recurse, 0); -+ display_tree_info_1 (w, recurse, 0); - } - - /* - * level - recursion level - */ - static void --display_tree_info_1 (Window window, int recurse, int level) -+display_tree_info_1 (struct wininfo *w, int recurse, int level) - { - int i, j; -- int rel_x, rel_y, abs_x, abs_y; -- unsigned int width, height, border, depth; -- Window root_win, parent_win; - unsigned int num_children; -- Window *child_list; -- XClassHint classhint; -+ xcb_query_tree_reply_t *tree; - -- if (!XQueryTree (dpy, window, &root_win, &parent_win, &child_list, -- &num_children)) -+ tree = xcb_query_tree_reply (dpy, w->tree_cookie, &err); -+ if (!tree) { -+ Print_X_Error (dpy, err); - Fatal_Error ("Can't query window tree."); -+ } - - if (level == 0) { -+ struct wininfo rw, pw; -+ rw.window = tree->root; -+ rw.wm_name_cookie = xcb_get_wm_name (dpy, rw.window); -+ pw.window = tree->parent; -+ pw.wm_name_cookie = xcb_get_wm_name (dpy, pw.window); -+ xcb_flush (dpy); -+ - printf ("\n"); - printf (" Root window id: "); -- Display_Window_Id (root_win, True); -+ Display_Window_Id (&rw, True); - printf (" Parent window id: "); -- Display_Window_Id (parent_win, True); -+ Display_Window_Id (&pw, True); - } - -+ num_children = xcb_query_tree_children_length (tree); -+ - if (level == 0 || num_children > 0) { - printf (" "); - for (j = 0; j < level; j++) printf (" "); -@@ -891,42 +1036,90 @@ display_tree_info_1 (Window window, int recurse, int level) - num_children ? ":" : "."); - } - -- for (i = (int)num_children - 1; i >= 0; i--) { -- printf (" "); -- for (j = 0; j < level; j++) printf (" "); -- Display_Window_Id (child_list[i], False); -- printf (": ("); -- if (XGetClassHint (dpy, child_list[i], &classhint)) { -- if (classhint.res_name) { -- printf ("\"%s\" ", classhint.res_name); -- XFree (classhint.res_name); -- } else -- printf ("(none) "); -- if (classhint.res_class) { -- printf ("\"%s\") ", classhint.res_class); -- XFree (classhint.res_class); -+ if (num_children > 0) { -+ xcb_window_t *child_list = xcb_query_tree_children (tree); -+ struct wininfo *children -+ = calloc (num_children, sizeof(struct wininfo)); -+ -+ if (children == NULL) -+ Fatal_Error ("Failed to allocate memory in display_tree_info"); -+ -+ for (i = (int)num_children - 1; i >= 0; i--) { -+ struct wininfo *cw = &children[i]; -+ -+ cw->window = child_list[i]; -+ cw->wm_name_cookie = xcb_get_wm_name (dpy, child_list[i]); -+ cw->wm_class_cookie = xcb_get_wm_class (dpy, child_list[i]); -+ cw->geometry_cookie = xcb_get_geometry (dpy, child_list[i]); -+ cw->trans_coords_cookie = xcb_translate_coordinates -+ (dpy, child_list[i], tree->root, 0, 0); -+ if (recurse) -+ cw->tree_cookie = xcb_query_tree (dpy, child_list[i]); -+ } -+ xcb_flush (dpy); -+ -+ for (i = (int)num_children - 1; i >= 0; i--) { -+ struct wininfo *cw = &children[i]; -+ xcb_get_wm_class_reply_t classhint; -+ xcb_get_geometry_reply_t *geometry; -+ -+ printf (" "); -+ for (j = 0; j < level; j++) printf (" "); -+ Display_Window_Id (cw, False); -+ printf (": ("); -+ -+ if (xcb_get_wm_class_reply (dpy, cw->wm_class_cookie, -+ &classhint, NULL)) { -+ if (classhint.instance_name) -+ printf ("\"%s\" ", classhint.instance_name); -+ else -+ printf ("(none) "); -+ -+ if (classhint.class_name) -+ printf ("\"%s\") ", classhint.class_name); -+ else -+ printf ("(none)) "); -+ -+ xcb_get_wm_class_reply_wipe (&classhint); - } else -- printf ("(none)) "); -- } else -- printf (") "); -- -- if (XGetGeometry (dpy, child_list[i], &root_win, -- &rel_x, &rel_y, &width, &height, &border, &depth)) { -- Window child; -- -- printf (" %ux%u+%d+%d", width, height, rel_x, rel_y); -- if (XTranslateCoordinates (dpy, child_list[i], root_win, -- 0 ,0, &abs_x, &abs_y, &child)) { -- printf (" +%d+%d", abs_x - border, abs_y - border); -+ printf (") "); -+ -+ geometry = xcb_get_geometry_reply(dpy, cw->geometry_cookie, &err); -+ if (geometry) { -+ xcb_translate_coordinates_reply_t *trans_coords; -+ -+ printf (" %ux%u+%d+%d", geometry->width, geometry->height, -+ geometry->x, geometry->y); -+ -+ trans_coords = xcb_translate_coordinates_reply -+ (dpy, cw->trans_coords_cookie, &err); -+ -+ if (trans_coords) { -+ int16_t abs_x = (int16_t) trans_coords->dst_x; -+ int16_t abs_y = (int16_t) trans_coords->dst_y; -+ int border = geometry->border_width; -+ -+ printf (" +%d+%d", abs_x - border, abs_y - border); -+ free (trans_coords); -+ } else if (err) { -+ Print_X_Error (dpy, err); -+ } -+ -+ free (geometry); -+ } else if (err) { -+ Print_X_Error (dpy, err); - } -- } -- printf ("\n"); -+ printf ("\n"); - -- if (recurse) -- display_tree_info_1 (child_list[i], 1, level+1); -+ if (recurse) -+ display_tree_info_1 (cw, 1, level+1); -+ -+ wininfo_wipe (cw); -+ } -+ free (children); - } - -- if (child_list) XFree ((char *)child_list); -+ free (tree); /* includes storage for child_list[] */ - } - - -@@ -934,74 +1127,74 @@ display_tree_info_1 (Window window, int recurse, int level) - * Display a set of size hints - */ - static void --Display_Hints (XSizeHints *hints) -+Display_Hints (xcb_size_hints_t *hints) - { - long flags; - - flags = hints->flags; - -- if (flags & USPosition) -+ if (flags & XCB_SIZE_HINT_US_POSITION) - printf (" User supplied location: %s, %s\n", - xscale (hints->x), yscale (hints->y)); - -- if (flags & PPosition) -+ if (flags & XCB_SIZE_HINT_P_POSITION) - printf (" Program supplied location: %s, %s\n", - xscale (hints->x), yscale (hints->y)); - -- if (flags & USSize) { -+ if (flags & XCB_SIZE_HINT_US_SIZE) { - printf (" User supplied size: %s by %s\n", - xscale (hints->width), yscale (hints->height)); - } - -- if (flags & PSize) -+ if (flags & XCB_SIZE_HINT_P_SIZE) - printf (" Program supplied size: %s by %s\n", - xscale (hints->width), yscale (hints->height)); - -- if (flags & PMinSize) -+ if (flags & XCB_SIZE_HINT_P_MIN_SIZE) - printf (" Program supplied minimum size: %s by %s\n", - xscale (hints->min_width), yscale (hints->min_height)); - -- if (flags & PMaxSize) -+ if (flags & XCB_SIZE_HINT_P_MAX_SIZE) - printf (" Program supplied maximum size: %s by %s\n", - xscale (hints->max_width), yscale (hints->max_height)); - -- if (flags & PBaseSize) { -+ if (flags & XCB_SIZE_HINT_BASE_SIZE) { - printf (" Program supplied base size: %s by %s\n", - xscale (hints->base_width), yscale (hints->base_height)); - } - -- if (flags & PResizeInc) { -+ if (flags & XCB_SIZE_HINT_P_RESIZE_INC) { - printf (" Program supplied x resize increment: %s\n", - xscale (hints->width_inc)); - printf (" Program supplied y resize increment: %s\n", - yscale (hints->height_inc)); - if (hints->width_inc != 0 && hints->height_inc != 0) { -- if (flags & USSize) -+ if (flags & XCB_SIZE_HINT_US_SIZE) - printf (" User supplied size in resize increments: %s by %s\n", - (xscale (hints->width / hints->width_inc)), - (yscale (hints->height / hints->height_inc))); -- if (flags & PSize) -+ if (flags & XCB_SIZE_HINT_P_SIZE) - printf (" Program supplied size in resize increments: %s by %s\n", - (xscale (hints->width / hints->width_inc)), - (yscale (hints->height / hints->height_inc))); -- if (flags & PMinSize) -+ if (flags & XCB_SIZE_HINT_P_MIN_SIZE) - printf (" Program supplied minimum size in resize increments: %s by %s\n", - xscale (hints->min_width / hints->width_inc), yscale (hints->min_height / hints->height_inc)); -- if (flags & PBaseSize) -+ if (flags & XCB_SIZE_HINT_BASE_SIZE) - printf (" Program supplied base size in resize increments: %s by %s\n", - (xscale (hints->base_width / hints->width_inc)), - (yscale (hints->base_height / hints->height_inc))); - } - } - -- if (flags & PAspect) { -+ if (flags & XCB_SIZE_HINT_P_ASPECT) { - printf (" Program supplied min aspect ratio: %s/%s\n", -- xscale (hints->min_aspect.x), yscale (hints->min_aspect.y)); -+ xscale (hints->min_aspect_num), yscale (hints->min_aspect_den)); - printf (" Program supplied max aspect ratio: %s/%s\n", -- xscale (hints->max_aspect.x), yscale (hints->max_aspect.y)); -+ xscale (hints->max_aspect_num), yscale (hints->max_aspect_den)); - } - -- if (flags & PWinGravity) { -+ if (flags & XCB_SIZE_HINT_P_WIN_GRAVITY) { - printf (" Program supplied window gravity: %s\n", - Lookup (hints->win_gravity, _gravities)); - } -@@ -1012,103 +1205,137 @@ Display_Hints (XSizeHints *hints) - * Display Size Hints info - */ - static void --Display_Size_Hints (Window window) -+Display_Size_Hints (struct wininfo *w) - { -- XSizeHints *hints = XAllocSizeHints (); -- long supplied; -+ xcb_size_hints_t hints; - - printf ("\n"); -- if (!XGetWMNormalHints (dpy, window, hints, &supplied)) -+ if (!fetch_normal_hints (w, &hints)) - printf (" No normal window size hints defined\n"); - else { - printf (" Normal window size hints:\n"); -- hints->flags &= supplied; -- Display_Hints (hints); -+ Display_Hints (&hints); - } - -- if (!XGetWMSizeHints (dpy, window, hints, &supplied, XA_WM_ZOOM_HINTS)) -+ if (!xcb_get_wm_size_hints_reply (dpy, w->zoom_cookie, &hints, NULL)) - printf (" No zoom window size hints defined\n"); - else { - printf (" Zoom window size hints:\n"); -- hints->flags &= supplied; -- Display_Hints (hints); -+ Display_Hints (&hints); - } -- XFree ((char *)hints); - } - - - static void --Display_Window_Shape (Window window) -+Display_Window_Shape (xcb_window_t window) - { -- Bool ws, bs; -- int xws, yws, xbs, ybs; -- unsigned int wws, hws, wbs, hbs; -+ const xcb_query_extension_reply_t *shape_query; -+ xcb_shape_query_extents_cookie_t extents_cookie; -+ xcb_shape_query_extents_reply_t *extents; - -- if (!XShapeQueryExtension (dpy, &bs, &ws)) -+ shape_query = xcb_get_extension_data (dpy, &xcb_shape_id); -+ if (!shape_query->present) - return; - - printf ("\n"); -- XShapeQueryExtents (dpy, window, &ws, &xws, &yws, &wws, &hws, -- &bs, &xbs, &ybs, &wbs, &hbs); -- if (!ws) -+ -+ extents_cookie = xcb_shape_query_extents (dpy, window); -+ extents = xcb_shape_query_extents_reply (dpy, extents_cookie, &err); -+ -+ if (!extents) { -+ if (err) -+ Print_X_Error (dpy, err); -+ else -+ { -+ printf (" No window shape defined\n"); -+ printf (" No border shape defined\n"); -+ } -+ return; -+ } -+ -+ if (!extents->bounding_shaped) - printf (" No window shape defined\n"); - else { - printf (" Window shape extents: %sx%s", -- xscale (wws), yscale (hws)); -- printf ("+%s+%s\n", xscale (xws), yscale (yws)); -+ xscale (extents->bounding_shape_extents_width), -+ yscale (extents->bounding_shape_extents_height)); -+ printf ("+%s+%s\n", -+ xscale (extents->bounding_shape_extents_x), -+ yscale (extents->bounding_shape_extents_y)); - } -- if (!bs) -+ if (!extents->clip_shaped) - printf (" No border shape defined\n"); - else { - printf (" Border shape extents: %sx%s", -- xscale (wbs), yscale (hbs)); -- printf ("+%s+%s\n", xscale (xbs), yscale (ybs)); -+ xscale (extents->clip_shape_extents_width), -+ yscale (extents->clip_shape_extents_height)); -+ printf ("+%s+%s\n", -+ xscale (extents->clip_shape_extents_x), -+ yscale (extents->clip_shape_extents_y)); - } -+ -+ free (extents); - } - - /* - * Display Window Manager Info -+ * -+ * Requires wininfo members initialized: -+ * window, hints_cookie - */ - static const binding _state_hints[] = { -- { DontCareState, "Don't Care State" }, -- { NormalState, "Normal State" }, -- { ZoomState, "Zoomed State" }, -- { IconicState, "Iconic State" }, -- { InactiveState, "Inactive State" }, -+ { XCB_WM_STATE_WITHDRAWN, "Withdrawn State" }, -+ { XCB_WM_STATE_NORMAL, "Normal State" }, -+ { XCB_WM_STATE_ICONIC, "Iconic State" }, -+/* xwininfo previously also reported the ZoomState & InactiveState, -+ but ICCCM declared those obsolete long ago */ - { 0, NULL } }; - - static void --Display_WM_Info (Window window) -+Display_WM_Info (struct wininfo *w) - { -- XWMHints *wmhints; -+ xcb_wm_hints_t wmhints; - long flags; - -- wmhints = XGetWMHints (dpy, window); - printf ("\n"); -- if (!wmhints) { -+ if (!xcb_get_wm_hints_reply(dpy, w->hints_cookie, &wmhints, &err)) -+ { - printf (" No window manager hints defined\n"); -+ if (err) -+ Print_X_Error (dpy, err); - return; - } -- flags = wmhints->flags; -+ flags = wmhints.flags; - - printf (" Window manager hints:\n"); - -- if (flags & InputHint) -+ if (flags & XCB_WM_HINT_INPUT) - printf (" Client accepts input or input focus: %s\n", -- Lookup (wmhints->input, _bool)); -+ Lookup (wmhints.input, _bool)); -+ -+ if (flags & XCB_WM_HINT_ICON_WINDOW) { -+ struct wininfo iw; -+ iw.window = wmhints.icon_window; -+ iw.wm_name_cookie = xcb_get_wm_name (dpy, iw.window); - -- if (flags & IconWindowHint) { - printf (" Icon window id: "); -- Display_Window_Id (wmhints->icon_window, True); -+ Display_Window_Id (&iw, True); - } - -- if (flags & IconPositionHint) -+ if (flags & XCB_WM_HINT_ICON_POSITION) - printf (" Initial icon position: %s, %s\n", -- xscale (wmhints->icon_x), yscale (wmhints->icon_y)); -+ xscale (wmhints.icon_x), yscale (wmhints.icon_y)); - -- if (flags & StateHint) -+ if (flags & XCB_WM_HINT_STATE) - printf (" Initial state is %s\n", -- Lookup (wmhints->initial_state, _state_hints)); -+ Lookup (wmhints.initial_state, _state_hints)); -+} - -- XFree (wmhints); -+/* Frees all members of a wininfo struct, but not the struct itself */ -+static void -+wininfo_wipe (struct wininfo *w) -+{ -+ free (w->geometry); -+ free (w->win_attributes); -+ free (w->normal_hints); - } --- -cgit v0.8.3-6-g21f6 -- cgit v1.2.3 From 78ce7f502c95de8a329379061f001888434f2ded Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 17 Jul 2010 20:43:38 +0000 Subject: main/xwininfo: moved from testing --- testing/xwininfo/APKBUILD | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 testing/xwininfo/APKBUILD (limited to 'testing') diff --git a/testing/xwininfo/APKBUILD b/testing/xwininfo/APKBUILD deleted file mode 100644 index 5074e3620e..0000000000 --- a/testing/xwininfo/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=xwininfo -pkgver=1.0.5 -pkgrel=1 -pkgdesc="Window information utility for X" -url="http://cgit.freedesktop.org/xorg/app/xwininfo/" -license="custom" -depends= -makedepends="libx11-dev libxext-dev" -install= -subpackages="$pkgname-doc" -source="http://xorg.freedesktop.org/releases/individual/app/xwininfo-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING -} - -md5sums="908f8bc3255f639effa9780fb1c19ea4 xwininfo-1.0.5.tar.bz2" -- cgit v1.2.3 From 1b673f9b85ad378c3255952050f142a1e9ccd723 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 19 Jul 2010 11:22:29 +0000 Subject: testing/glade3: new aport a RAD tool to enable quick & easy development of user interfaces for GTK+ http://glade.gnome.org/ --- testing/glade3/APKBUILD | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 testing/glade3/APKBUILD (limited to 'testing') diff --git a/testing/glade3/APKBUILD b/testing/glade3/APKBUILD new file mode 100644 index 0000000000..43dbdc3e58 --- /dev/null +++ b/testing/glade3/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: Natanael Copa +pkgname=glade3 +pkgver=3.6.7 +pkgrel=0 +pkgdesc="a RAD tool to enable quick & easy development of user interfaces for GTK+" +url="http://glade.gnome.org/" +license="GPL" +depends= +makedepends="gtk+-dev" +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-$pkgver.tar.bz2" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="0fbe06e4babb2adeaf9725577ff43395 glade3-3.6.7.tar.bz2" -- cgit v1.2.3 From f35ad3221162020000991bbddb5203227c53778a Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 19 Jul 2010 12:00:37 +0000 Subject: testing/glade3: build fix --- testing/glade3/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/glade3/APKBUILD b/testing/glade3/APKBUILD index 43dbdc3e58..72e2c925a1 100644 --- a/testing/glade3/APKBUILD +++ b/testing/glade3/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="a RAD tool to enable quick & easy development of user interfaces for GT url="http://glade.gnome.org/" license="GPL" depends= -makedepends="gtk+-dev" +makedepends="gtk+-dev libxml2-dev" install= subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-$pkgver.tar.bz2" -- cgit v1.2.3 From 18d9f9af03c9797a0cb68c105b281e52900564fd Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Mon, 19 Jul 2010 12:15:20 +0000 Subject: testing/openlldp: new aport --- testing/openlldp/APKBUILD | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 testing/openlldp/APKBUILD (limited to 'testing') diff --git a/testing/openlldp/APKBUILD b/testing/openlldp/APKBUILD new file mode 100644 index 0000000000..140ff91d96 --- /dev/null +++ b/testing/openlldp/APKBUILD @@ -0,0 +1,40 @@ +# Maintainer: Leonardo Arena +pkgname=openlldp +pkgver=0.4a +_realver=0.4alpha +pkgrel=0 +pkgdesc="Open Source implementation of the IEEE standard 802.1AB Link Layer Discovery Protocol (LLDP)" +url="http://openlldp.sourceforge.net/" +license="GPL" +depends= +makedepends= +install= +subpackages="" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_realver.tar.gz" + +_builddir="$srcdir"/$pkgname-$_realver + +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install + + # remove the 2 lines below (and this) if there is no init.d script + # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +md5sums="f48ffd632b96246cbf0f5c485dea3b01 openlldp-0.4alpha.tar.gz" -- cgit v1.2.3 From adaea81fd6f75090711f93717d3134d6003a2371 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 19 Jul 2010 15:51:27 +0000 Subject: testing/freeswitch-sounds-music-8000: new aport Sounds for freeswitch Music http://files.freeswitch.org/ --- testing/freeswitch-sounds-music-8000/APKBUILD | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 testing/freeswitch-sounds-music-8000/APKBUILD (limited to 'testing') diff --git a/testing/freeswitch-sounds-music-8000/APKBUILD b/testing/freeswitch-sounds-music-8000/APKBUILD new file mode 100644 index 0000000000..9cf9655bb5 --- /dev/null +++ b/testing/freeswitch-sounds-music-8000/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: +# Maintainer: Natanael Copa +pkgname=freeswitch-sounds-music-8000 +pkgver=1.0.8 +pkgrel=0 +pkgdesc="Sounds for freeswitch Music" +url="http://files.freeswitch.org/" +license="unknown" +depends= +makedepends= +install= +subpackages= +source="http://files.freeswitch.org/freeswitch-sounds-music-8000-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +build() { + return 0 +} + +package() { + mkdir -p "$pkgdir"/usr/sounds/ + cp -ra "$srcdir"/ "$pkgdir"/usr/sounds +} + +md5sums="f63ef3cc3507af079ae5c7b8b8a01e42 freeswitch-sounds-music-8000-$pkgver.tar.gz" + -- cgit v1.2.3 From c240a5afa28119950756bede04ab393eb392265f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 19 Jul 2010 15:59:45 +0000 Subject: testing/freeswitch-sounds-es-mx-maria-44100: new aport Sounds for freeswitch Spanish http://files.freeswitch.org/ --- testing/freeswitch-sounds-es-mx-maria/APKBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 testing/freeswitch-sounds-es-mx-maria/APKBUILD (limited to 'testing') diff --git a/testing/freeswitch-sounds-es-mx-maria/APKBUILD b/testing/freeswitch-sounds-es-mx-maria/APKBUILD new file mode 100644 index 0000000000..db0cd12c7b --- /dev/null +++ b/testing/freeswitch-sounds-es-mx-maria/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: +# Maintainer: Natanael Copa +pkgname=freeswitch-sounds-es-mx-maria-44100 +pkgver="0" +pkgrel=0 +pkgdesc="Sounds for freeswitch Spanish" +url="http://files.freeswitch.org/" +license="unknown" +depends= +makedepends= +install= +subpackages= +source="http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver + +build() { + return 0 +} + +package() { + mkdir -p "$pkgdir"/usr/sounds/ + cp -ra "$srcdir"/ "$pkgdir"/usr/sounds +} + +md5sums="a83a2e994741e4085016873d2d1c69a4 freeswitch-sounds-es-mx-maria-44100.tar.gz" -- cgit v1.2.3 From 348e3ff15e5876a202281c695d32b2b63f5263ce Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 20 Jul 2010 06:55:53 +0000 Subject: main/glade3: moved from testing --- testing/glade3/APKBUILD | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 testing/glade3/APKBUILD (limited to 'testing') diff --git a/testing/glade3/APKBUILD b/testing/glade3/APKBUILD deleted file mode 100644 index 72e2c925a1..0000000000 --- a/testing/glade3/APKBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=glade3 -pkgver=3.6.7 -pkgrel=0 -pkgdesc="a RAD tool to enable quick & easy development of user interfaces for GTK+" -url="http://glade.gnome.org/" -license="GPL" -depends= -makedepends="gtk+-dev libxml2-dev" -install= -subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/glade3-$pkgver.tar.bz2" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" -} - -build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install -} - -md5sums="0fbe06e4babb2adeaf9725577ff43395 glade3-3.6.7.tar.bz2" -- cgit v1.2.3 From c399d539f0e3802194114d2566e8334951ffb146 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 23 Jul 2010 18:07:58 +0000 Subject: testing/bluez: upgrade to 4.69 --- testing/bluez/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD index b8a18a350e..2bf90aea96 100644 --- a/testing/bluez/APKBUILD +++ b/testing/bluez/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=bluez -pkgver=4.64 -pkgrel=1 +pkgver=4.69 +pkgrel=0 pkgdesc="Tools for the Bluetooth protocol stack" url="http://www.bluez.org/" license="GPL2" @@ -72,6 +72,6 @@ netlink() { "$subpkgdir"/usr/lib/bluetooth/plugins } -md5sums="d6e60bad937fe72b0bc77e327ee470b0 bluez-4.64.tar.bz2 +md5sums="350568aa11a95eac6e56e9289ff1f91d bluez-4.69.tar.bz2 66408fb89b05e7ce7e61c4c3c356d2c6 bluetooth.initd a159d897a057f4675548327329c4cc22 bluetooth.confd" -- cgit v1.2.3 From d3edd157d08526e8f63d01e4b4c0acdf6d1a8c10 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 23 Jul 2010 18:29:59 +0000 Subject: testing/bluez: fix support for usb and gstreamer --- testing/bluez/APKBUILD | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'testing') diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD index 2bf90aea96..1ae394e84f 100644 --- a/testing/bluez/APKBUILD +++ b/testing/bluez/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa pkgname=bluez pkgver=4.69 -pkgrel=0 +pkgrel=1 pkgdesc="Tools for the Bluetooth protocol stack" url="http://www.bluez.org/" license="GPL2" depends= -makedepends="dbus-dev gstreamer-dev alsa-lib-dev libusb-dev libnl-dev" +makedepends="dbus-dev gst-plugins-base-dev alsa-lib-dev libusb-compat-dev + libnl-dev" subpackages="$pkgname-dev $pkgname-doc libbluetooth $pkgname-alsa $pkgname-cups - $pkgname-netlink" + $pkgname-netlink $pkgname-gstreamer" source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2 bluetooth.initd bluetooth.confd @@ -72,6 +73,12 @@ netlink() { "$subpkgdir"/usr/lib/bluetooth/plugins } +gstreamer() { + pkgdesc="Bluez plugin for gstreamer" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/gstreamer* \ + "$subpkgdir"/usr/lib/ +} md5sums="350568aa11a95eac6e56e9289ff1f91d bluez-4.69.tar.bz2 66408fb89b05e7ce7e61c4c3c356d2c6 bluetooth.initd a159d897a057f4675548327329c4cc22 bluetooth.confd" -- cgit v1.2.3 From dd195cdcf5e67c9c21257512ded0a03b5bff0d5e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 23 Jul 2010 18:44:57 +0000 Subject: testing/libusb-compat: fix dependency for -dev --- testing/libusb-compat/APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/libusb-compat/APKBUILD b/testing/libusb-compat/APKBUILD index d36933b66b..daffca273e 100644 --- a/testing/libusb-compat/APKBUILD +++ b/testing/libusb-compat/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Leonardo Arena pkgname=libusb-compat pkgver=0.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Compatibility library for use by user level applications to access USB devices regardless of OS" url="http://www.libusb.org/" license="LGPL v2.1" depends= makedepends="libusb-dev" +depends_dev="libusb-dev" install= subpackages="$pkgname-dev" source="http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" -- cgit v1.2.3 From ea3f9462b32674efcb34d577e5a620580d977766 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 23 Jul 2010 19:27:51 +0000 Subject: testing/bluez: include bluez-simple-agent --- testing/bluez/APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD index 1ae394e84f..a011239283 100644 --- a/testing/bluez/APKBUILD +++ b/testing/bluez/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=bluez pkgver=4.69 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for the Bluetooth protocol stack" url="http://www.bluez.org/" license="GPL2" @@ -45,6 +45,7 @@ package() { make install DESTDIR="$pkgdir" install -Dm755 "$srcdir"/bluetooth.initd "$pkgdir"/etc/init.d/bluetooth install -Dm644 "$srcdir"/bluetooth.confd "$pkgdir"/etc/conf.d/bluetooth + install -Dm755 "$srcdir"/test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent } libbluetooth() { -- cgit v1.2.3 From 0ece70338db480ca97a5edbdc0351d09ec956269 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 23 Jul 2010 19:34:04 +0000 Subject: testing/bluez: build fix --- testing/bluez/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD index a011239283..6ccd959312 100644 --- a/testing/bluez/APKBUILD +++ b/testing/bluez/APKBUILD @@ -45,7 +45,7 @@ package() { make install DESTDIR="$pkgdir" install -Dm755 "$srcdir"/bluetooth.initd "$pkgdir"/etc/init.d/bluetooth install -Dm644 "$srcdir"/bluetooth.confd "$pkgdir"/etc/conf.d/bluetooth - install -Dm755 "$srcdir"/test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent + install -Dm755 test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent } libbluetooth() { -- cgit v1.2.3 From 7ae1072fba012df7f5cea36c55d923c0a2f5b817 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 24 Jul 2010 07:56:16 +0000 Subject: testing/py-gobject: new aport Python bindings for the GObject library http://www.pygtk.org/ --- testing/py-gobject/APKBUILD | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 testing/py-gobject/APKBUILD (limited to 'testing') diff --git a/testing/py-gobject/APKBUILD b/testing/py-gobject/APKBUILD new file mode 100644 index 0000000000..fe758d3c9a --- /dev/null +++ b/testing/py-gobject/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: +# Maintainer: Natanael Copa +pkgname=py-gobject +pkgver=2.20.0 +pkgrel=0 +pkgdesc="Python bindings for the GObject library" +url="http://www.pygtk.org/" +license="GPL" +depends= +makedepends="python-dev glib-dev" +install= +subpackages="$pkgname-dev $pkgname-doc" +source="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-$pkgver.tar.bz2" + +_builddir="$srcdir"/pygobject-$pkgver +prepare() { + cd "$_builddir" + # apply patches here +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="10e1fb79be3d698476a28b1e1b0c5640 pygobject-2.20.0.tar.bz2" -- cgit v1.2.3 From 696cbfd0ad23379ae90f40ba336efd0cef18a834 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sat, 24 Jul 2010 08:09:49 +0000 Subject: testing/py-dbus: new aport Python bindings for DBUS http://www.freedesktop.org/wiki/Software/DBusBindings --- testing/py-dbus/APKBUILD | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 testing/py-dbus/APKBUILD (limited to 'testing') diff --git a/testing/py-dbus/APKBUILD b/testing/py-dbus/APKBUILD new file mode 100644 index 0000000000..64e1d54181 --- /dev/null +++ b/testing/py-dbus/APKBUILD @@ -0,0 +1,25 @@ +# Maintainer: Natanael Copa +pkgname=py-dbus +pkgver=0.83.1 +pkgrel=0 +pkgdesc="Python bindings for DBUS" +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +license="GPL LGPL" +depends="python>=2.6.5" +makedepends="pkgconfig dbus-glib-dev python-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-$pkgver.tar.gz" + +_builddir="$srcdir"/dbus-python-$pkgver +build() { + cd "$_builddir" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="5fdf3970aa0c00020289de7ba8f3be18 dbus-python-0.83.1.tar.gz" -- cgit v1.2.3 From 28d08f8ac2796f1be43712d277540a1aeac932e6 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 26 Jul 2010 14:30:48 +0000 Subject: testing/sems: bump pkgrel so we get the init.d script included --- testing/sems/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') diff --git a/testing/sems/APKBUILD b/testing/sems/APKBUILD index 9d16fc8336..c587cae82d 100644 --- a/testing/sems/APKBUILD +++ b/testing/sems/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista pkgname=sems pkgver=1.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="High performance, extensible media server for SIP (RFC3261) based VoIP services" url="http://iptel.org/sems/" license="GPL-2" -- cgit v1.2.3 From 6a74f0064cfb6554de47f73b56c9c58e2914fe9f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 27 Jul 2010 07:24:41 +0000 Subject: testing/cmph: new aport minimal perfect hash C library - utility application http://cmph.sourceforge.net/ --- testing/cmph/APKBUILD | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 testing/cmph/APKBUILD (limited to 'testing') diff --git a/testing/cmph/APKBUILD b/testing/cmph/APKBUILD new file mode 100644 index 0000000000..a52b0bcf13 --- /dev/null +++ b/testing/cmph/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: +# Maintainer: +pkgname=cmph +pkgver=0.9 +pkgrel=0 +pkgdesc="minimal perfect hash C library - utility application" +url="http://cmph.sourceforge.net/" +license="LGPL MPL-1.1" +depends= +makedepends= +install= +subpackages="$pkgname-dev $pkgname-doc libcmph:lib" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +lib() { + pkgdesc="minimal perfect hash C library - utility application" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libcmph*.so.* "$subpkgdir"/usr/lib/ +} + +md5sums="14c17e3058174e9333936caa8e18ed28 cmph-0.9.tar.gz" -- cgit v1.2.3 From 76ec47a71a94d95451e36a71c847c29175044eae Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 27 Jul 2010 09:38:56 +0000 Subject: testing/iw: new aport nl80211 based CLI configuration utility for wireless devices http://wireless.kernel.org/en/users/Documentation/iw --- testing/iw/APKBUILD | 33 +++++++++++++++++++++++++++++++++ testing/iw/iw-bb-install.patch | 15 +++++++++++++++ testing/iw/iw-git-version.patch | 11 +++++++++++ 3 files changed, 59 insertions(+) create mode 100644 testing/iw/APKBUILD create mode 100644 testing/iw/iw-bb-install.patch create mode 100644 testing/iw/iw-git-version.patch (limited to 'testing') diff --git a/testing/iw/APKBUILD b/testing/iw/APKBUILD new file mode 100644 index 0000000000..3cce23eff1 --- /dev/null +++ b/testing/iw/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: Natanael Copa +pkgname=iw +pkgver=0.9.18 +pkgrel=0 +pkgdesc="nl80211 based CLI configuration utility for wireless devices" +url="http://wireless.kernel.org/en/users/Documentation/iw" +license="GPL" +depends="" +makedepends="libnl-dev" +source="http://wireless.kernel.org/download/iw/iw-$pkgver.tar.bz2 + iw-bb-install.patch + iw-git-version.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/iw-bb-install.patch || return 1 + patch -p1 -i "$srcdir"/iw-git-version.patch || return 1 +} + +build () { + cd "$_builddir" + make V=1 || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="9734080d8a5c4b768c5e0da665a48950 iw-0.9.18.tar.bz2 +7f8cfc205fdcfd49d04c8923c76f439a iw-bb-install.patch +779d0e73df6e484c071149c9fb720551 iw-git-version.patch" diff --git a/testing/iw/iw-bb-install.patch b/testing/iw/iw-bb-install.patch new file mode 100644 index 0000000000..b736dbf7c2 --- /dev/null +++ b/testing/iw/iw-bb-install.patch @@ -0,0 +1,15 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -86,10 +86,10 @@ + install: iw iw.8.gz + @$(NQ) ' INST iw' + $(Q)$(MKDIR) $(DESTDIR)$(SBINDIR) +- $(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(SBINDIR) iw ++ $(Q)$(INSTALL) -m 755 iw $(DESTDIR)$(SBINDIR)/ + @$(NQ) ' INST iw.8' + $(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/ +- $(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz ++ $(Q)$(INSTALL) -m 644 iw.8.gz $(DESTDIR)$(MANDIR)/man8/ + + clean: + $(Q)rm -f iw *.o *~ *.gz version.c *-stamp diff --git a/testing/iw/iw-git-version.patch b/testing/iw/iw-git-version.patch new file mode 100644 index 0000000000..0286eb4889 --- /dev/null +++ b/testing/iw/iw-git-version.patch @@ -0,0 +1,11 @@ +--- ./version.sh.orig ++++ ./version.sh +@@ -5,7 +5,7 @@ + + echo '#include "iw.h"' > "$OUT" + +-if head=`git rev-parse --verify HEAD 2>/dev/null`; then ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then + git update-index --refresh --unmerged > /dev/null + descr=$(git describe) + -- cgit v1.2.3 From d135d0bcf985282f2b600f7c8a5fabadb5d454a6 Mon Sep 17 00:00:00 2001 From: Andrew Manison Date: Tue, 27 Jul 2010 15:27:42 +0000 Subject: testing/lua-rex: renamed directory to match package name, from lua-rexlib to lua-rex. --- testing/lua-rex/APKBUILD | 47 +++++++++++++++++++++++++++++++++++++++++++++ testing/lua-rexlib/APKBUILD | 47 --------------------------------------------- 2 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 testing/lua-rex/APKBUILD delete mode 100644 testing/lua-rexlib/APKBUILD (limited to 'testing') diff --git a/testing/lua-rex/APKBUILD b/testing/lua-rex/APKBUILD new file mode 100644 index 0000000000..4f7bce0891 --- /dev/null +++ b/testing/lua-rex/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: +# Maintainer: +pkgname=lua-rex +pkgver=2.4.0 +pkgrel=1 +pkgdesc="Lua bindings to regular expression library pcre and posix" +url="http://lrexlib.luaforge.net/" +license="MIT" +depends="lua-rex-pcre lua-rex-posix" +makedepends="pcre-dev lua-dev" +install= +subpackages="$pkgname-pcre $pkgname-posix" +source="http://luaforge.net/frs/download.php/3599/lrexlib-$pkgver.zip" + +_builddir="$srcdir"/lrexlib-$pkgver + +prepare() { + cd "$_builddir" + sed -i -e "s/^MYCFLAGS.*/MYCFLAGS = $CFLAGS/" src/defaults.mak + sed -i -e "s/^LD .*/LD = gcc/" \ + src/common.mak +} + +build() { + cd "$_builddir" + make -j1 build_pcre build_posix +} + +package() { + mkdir -p "$pkgdir" +} + +pcre() { + pkgdesc="Lua bindings to pcre regular expressions library" + cd "$_builddir" + install -d "$subpkgdir"/usr/lib/lua/5.1 + cp -a src/pcre/rex_pcre.so* "$subpkgdir"/usr/lib/lua/5.1 +} + +posix() { + pkgdesc="Lua bindings to posix regular expressions library" + cd "$_builddir" + install -d "$subpkgdir"/usr/lib/lua/5.1 + cp -a src/posix/rex_posix.so* "$subpkgdir"/usr/lib/lua/5.1 +} + +md5sums="c75d4164ac5036219eac87b488ded9b7 lrexlib-2.4.0.zip" diff --git a/testing/lua-rexlib/APKBUILD b/testing/lua-rexlib/APKBUILD deleted file mode 100644 index 4f7bce0891..0000000000 --- a/testing/lua-rexlib/APKBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Contributor: -# Maintainer: -pkgname=lua-rex -pkgver=2.4.0 -pkgrel=1 -pkgdesc="Lua bindings to regular expression library pcre and posix" -url="http://lrexlib.luaforge.net/" -license="MIT" -depends="lua-rex-pcre lua-rex-posix" -makedepends="pcre-dev lua-dev" -install= -subpackages="$pkgname-pcre $pkgname-posix" -source="http://luaforge.net/frs/download.php/3599/lrexlib-$pkgver.zip" - -_builddir="$srcdir"/lrexlib-$pkgver - -prepare() { - cd "$_builddir" - sed -i -e "s/^MYCFLAGS.*/MYCFLAGS = $CFLAGS/" src/defaults.mak - sed -i -e "s/^LD .*/LD = gcc/" \ - src/common.mak -} - -build() { - cd "$_builddir" - make -j1 build_pcre build_posix -} - -package() { - mkdir -p "$pkgdir" -} - -pcre() { - pkgdesc="Lua bindings to pcre regular expressions library" - cd "$_builddir" - install -d "$subpkgdir"/usr/lib/lua/5.1 - cp -a src/pcre/rex_pcre.so* "$subpkgdir"/usr/lib/lua/5.1 -} - -posix() { - pkgdesc="Lua bindings to posix regular expressions library" - cd "$_builddir" - install -d "$subpkgdir"/usr/lib/lua/5.1 - cp -a src/posix/rex_posix.so* "$subpkgdir"/usr/lib/lua/5.1 -} - -md5sums="c75d4164ac5036219eac87b488ded9b7 lrexlib-2.4.0.zip" -- cgit v1.2.3 From 390e45e6bad74946c1aaf87fa7ad180b434b05b9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 28 Jul 2010 13:40:43 +0000 Subject: testing/smokeping: new aport Smokeping network latency monitoring http://oss.oetiker.ch/smokeping/ ref #348 --- testing/smokeping/APKBUILD | 107 ++++++++++++++++++++++++++++++++ testing/smokeping/smokeping.initd | 77 +++++++++++++++++++++++ testing/smokeping/smokeping.pre-install | 5 ++ 3 files changed, 189 insertions(+) create mode 100644 testing/smokeping/APKBUILD create mode 100644 testing/smokeping/smokeping.initd create mode 100644 testing/smokeping/smokeping.pre-install (limited to 'testing') diff --git a/testing/smokeping/APKBUILD b/testing/smokeping/APKBUILD new file mode 100644 index 0000000000..9ea5710534 --- /dev/null +++ b/testing/smokeping/APKBUILD @@ -0,0 +1,107 @@ +# Contributor: Jeff Bilyk +pkgname=smokeping +pkgver=2.4.2 +pkgrel=0 +pkgdesc="Smokeping network latency monitoring" +pkgusers="smokeping" +pkggroups="smokeping" +install="$pkgname.pre-install" +url="http://oss.oetiker.ch/smokeping/" +source="http://oss.oetiker.ch/smokeping/pub/smokeping-$pkgver.tar.gz + smokeping.initd" +depends="perl fping rrdtool perl-rrd + perl-uri-escape + perl-digest-hmac + perl-cgi-session + perl-libwww + perl-snmp-session + perl-net-dns + " +license="GPL" + +_builddir="$srcdir"/$pkgname-$pkgver +_vendorlib=/usr/share/perl5/vendor_perl + +prepare() { + cd "$_builddir" + # provided by perl-digest-hmac + rm -rf lib/Digest + # provided by perl-cgi-session + rm -rf lib/CGI + # provided by perl-snmp-session + rm -r lib/BER.pm lib/SNMP_Session.pm lib/SNMP_util.pm + rm -r qooxdoo/qooxdoolink +} + +build() { + return 0 +} + +package() { + cd "$_builddir" + + # create dirs + mkdir -p "$pkgdir"/etc/smokeping \ + "$pkgdir"/usr/bin \ + "$pkgdir"/usr/share/webapps/smokeping \ + "$pkgdir"/$_vendorlib + + # install libs + cp -ra "$_builddir"/lib/* "$pkgdir"/$_vendorlib + + # install cgi scripts + sed -e 's:^use lib:#use lib:g' \ + -e 's:/home/oetiker.*/config.dist:/etc/smokeping/config:' \ + -i htdocs/*.cgi.dist + + for i in smokeping.cgi tr.cgi; do + install -m755 htdocs/$i.dist \ + "$pkgdir"/usr/share/webapps/smokeping/$i \ + || return 1 + rm htdocs/$i.dist + done + + # install ajax scripts + mv "$_builddir/htdocs"/* "$pkgdir"/usr/share/webapps/smokeping + + # install smokeping executables + for i in smokeping tSmoke; do + sed -e 's:^use lib:#use lib:g' \ + -e 's:etc/config.dist:/etc/smokeping/config:' \ + -i bin/$i.dist + install -m755 bin/$i.dist "$pkgdir"/usr/bin/$i + done + + # config + sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ + -e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \ + -e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \ + -e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \ + -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \ + -e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \ + -e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \ + -e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ + -e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ + -i etc/config.dist || return 1 + + sed -e '/^