This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via cdd964e9f8907999c9a54b4d15271902d0666064 (commit) via 598293d753a64133321bb660ebd3b67c57ccc998 (commit) via c3a05990d7bec5acd4460d6079d23231b0962137 (commit) via f7108e23e54a5783b5fc720b58954b31ddb6495b (commit) via 4663169f4991d306d67dfdc049294fdf65b0b0a5 (commit) via c2adfd375e04ea2af12428342b69b714efe4823b (commit) via 98e4b7dccf63fd6c1cdf7c089e22f054b4d82e1e (commit) via 01441c88a23e90b78c7ba943d66e3b542a0c9cbd (commit) via e0c4818d612a9ac909d9a07a71cd2d5037ac8b3a (commit) via 137c998130a6b873d9bd5c756903f06ea89d7879 (commit) via 4b2af69ae4dd8a816141742be8a3a72771dacc2a (commit) via 765cf0e9be7622bb54c5d0b2d39a2ae8e388949c (commit) via 62e73637d310d935eb4b78f81aeecf1ebf8d2b9d (commit) via c81fdcc9fd9f71feeaea284c19d2a0b606820cb7 (commit) via 930b94431503424efe06ac576543abd688a5968b (commit) from 6eed299202d2f9c25abc53def2304af28e81ec21 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit cdd964e9f8907999c9a54b4d15271902d0666064 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 8 20:58:57 2010 +0200

iscsi-initiator-utils: New package.

commit 598293d753a64133321bb660ebd3b67c57ccc998 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 8 17:08:55 2010 +0200

audit: Divided into 2 more packages.

commit c3a05990d7bec5acd4460d6079d23231b0962137 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 8 08:24:11 2010 +0200

audit: New package.

commit f7108e23e54a5783b5fc720b58954b31ddb6495b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 15 21:20:09 2010 +0200

nss-util: Likewise.

commit 4663169f4991d306d67dfdc049294fdf65b0b0a5 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 15 21:19:17 2010 +0200

nss: -devel should also depend on main package.

commit c2adfd375e04ea2af12428342b69b714efe4823b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 15 21:18:55 2010 +0200

nss: Depend on nss-softokn.

commit 98e4b7dccf63fd6c1cdf7c089e22f054b4d82e1e Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 15 21:18:34 2010 +0200

nss-softokn: New package.

commit 01441c88a23e90b78c7ba943d66e3b542a0c9cbd Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 15 20:42:14 2010 +0200

nss: Depend on nss-util.

commit e0c4818d612a9ac909d9a07a71cd2d5037ac8b3a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 15 20:42:02 2010 +0200

nss-util: New package.

commit 137c998130a6b873d9bd5c756903f06ea89d7879 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 15 19:26:29 2010 +0200

nss: New package.

commit 4b2af69ae4dd8a816141742be8a3a72771dacc2a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 15 19:26:11 2010 +0200

nspr: New package.

commit 765cf0e9be7622bb54c5d0b2d39a2ae8e388949c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 14 22:01:17 2010 +0200

util-linux-ng: Update to 2.18.

commit 62e73637d310d935eb4b78f81aeecf1ebf8d2b9d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 16 00:22:54 2010 +0200

hwdata: New package.

commit c81fdcc9fd9f71feeaea284c19d2a0b606820cb7 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 16 00:23:25 2010 +0200

pciutils: Move pci.ids to /usr/share/pci.ids.

commit 930b94431503424efe06ac576543abd688a5968b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 16 23:13:04 2010 +0200

kbd: Downgrade to 1.15.

-----------------------------------------------------------------------

Summary of changes: pkgs/core/audit/audit.nm | 72 + pkgs/core/hwdata/hwdata.nm | 47 + pkgs/core/iscsi-initiator-utils/04-iscsi | 17 + .../iscsi-initiator-utils/iscsi-initiator-utils.nm | 102 + .../iscsi-initiator-utils-add-libiscsi.patch | 3737 ++++++++++++++++++++ ...scsi-initiator-utils-disable-isns-for-lib.patch | 74 + .../iscsi-initiator-utils-dont-use-static.patch | 12 + .../iscsi-initiator-utils-fix-lib-sysfs-init.patch | 49 + .../iscsi-initiator-utils-only-root-use.patch | 16 + .../patches/iscsi-initiator-utils-uip-mgmt.patch | 385 ++ ...itiator-utils-update-initscripts-and-docs.patch | 114 + ...scsi-initiator-utils-use-red-hat-for-name.patch | 12 + .../iscsi-initiator-utils-use-var-for-config.patch | 234 ++ pkgs/core/kbd/kbd.nm | 3 +- pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch | 12 + pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch | 52 + pkgs/core/kbd/patches/kbd-1.15-po.patch | 31 + pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch | 34 + .../kbd/patches/kbd-1.15-resizecon-x86_64.patch | 15 + pkgs/core/kbd/patches/kbd-1.15-sparc.patch | 97 + pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch | 21 + pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch | 250 -- pkgs/core/nspr/nspr-config-vars.in | 2 + pkgs/core/nspr/nspr.nm | 107 + pkgs/core/nspr/nspr.pc.in | 10 + pkgs/core/nspr/patches/nspr-config-pc.patch | 48 + pkgs/core/nss-softokn/nss-softokn-config.in | 116 + pkgs/core/nss-softokn/nss-softokn.nm | 131 + pkgs/core/nss-softokn/nss-softokn.pc.in | 11 + pkgs/core/nss-softokn/nss-softokn.spec | 462 +++ .../patches/nss-softokn-3.12.4-fips-fix.patch | 12 + .../patches/nss-softokn-3.12.4-prelink.patch | 298 ++ pkgs/core/nss-util/nss-util-config.in | 118 + pkgs/core/nss-util/nss-util.nm | 109 + pkgs/core/nss-util/nss-util.pc.in | 11 + pkgs/core/nss-util/nss-util.spec | 278 ++ pkgs/core/nss/PayPalEE.cert | Bin 0 -> 1483 bytes pkgs/core/nss/cert8.db | Bin 0 -> 65536 bytes pkgs/core/nss/cert9.db | Bin 0 -> 9216 bytes pkgs/core/nss/key3.db | Bin 0 -> 16384 bytes pkgs/core/nss/key4.db | Bin 0 -> 11264 bytes pkgs/core/nss/nss-config.in | 145 + pkgs/core/nss/nss.nm | 225 ++ pkgs/core/nss/nss.pc.in | 11 + ...d-support-for-PKCS-8-encoded-private-keys.patch | 237 ++ .../0001-Do-not-define-SEC_SkipTemplate.patch | 35 + pkgs/core/nss/patches/nss-enable-pem.patch | 12 + .../nss/patches/nss-sysinit-userdb-first.patch | 65 + pkgs/core/nss/patches/nsspem-596674.patch | 127 + .../nss/patches/renegotiate-transitional.patch | 12 + pkgs/core/nss/secmod.db | Bin 0 -> 16384 bytes pkgs/core/nss/setup-nsssysinit.sh | 68 + pkgs/core/nss/system-pkcs11.txt | 5 + pkgs/core/pciutils/pciutils.nm | 7 +- pkgs/core/util-linux-ng/util-linux-ng.nm | 4 +- 55 files changed, 7796 insertions(+), 256 deletions(-) create mode 100644 pkgs/core/audit/audit.nm create mode 100644 pkgs/core/hwdata/hwdata.nm create mode 100755 pkgs/core/iscsi-initiator-utils/04-iscsi create mode 100644 pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch create mode 100644 pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch create mode 100644 pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch create mode 100644 pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch create mode 100644 pkgs/core/kbd/patches/kbd-1.15-po.patch create mode 100644 pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch create mode 100644 pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch create mode 100644 pkgs/core/kbd/patches/kbd-1.15-sparc.patch create mode 100644 pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch delete mode 100644 pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch create mode 100644 pkgs/core/nspr/nspr-config-vars.in create mode 100644 pkgs/core/nspr/nspr.nm create mode 100644 pkgs/core/nspr/nspr.pc.in create mode 100644 pkgs/core/nspr/patches/nspr-config-pc.patch create mode 100644 pkgs/core/nss-softokn/nss-softokn-config.in create mode 100644 pkgs/core/nss-softokn/nss-softokn.nm create mode 100644 pkgs/core/nss-softokn/nss-softokn.pc.in create mode 100644 pkgs/core/nss-softokn/nss-softokn.spec create mode 100644 pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch create mode 100644 pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch create mode 100644 pkgs/core/nss-util/nss-util-config.in create mode 100644 pkgs/core/nss-util/nss-util.nm create mode 100644 pkgs/core/nss-util/nss-util.pc.in create mode 100644 pkgs/core/nss-util/nss-util.spec create mode 100644 pkgs/core/nss/PayPalEE.cert create mode 100644 pkgs/core/nss/cert8.db create mode 100644 pkgs/core/nss/cert9.db create mode 100644 pkgs/core/nss/key3.db create mode 100644 pkgs/core/nss/key4.db create mode 100644 pkgs/core/nss/nss-config.in create mode 100644 pkgs/core/nss/nss.nm create mode 100644 pkgs/core/nss/nss.pc.in create mode 100644 pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch create mode 100644 pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch create mode 100644 pkgs/core/nss/patches/nss-enable-pem.patch create mode 100755 pkgs/core/nss/patches/nss-sysinit-userdb-first.patch create mode 100644 pkgs/core/nss/patches/nsspem-596674.patch create mode 100644 pkgs/core/nss/patches/renegotiate-transitional.patch create mode 100644 pkgs/core/nss/secmod.db create mode 100755 pkgs/core/nss/setup-nsssysinit.sh create mode 100644 pkgs/core/nss/system-pkcs11.txt

Difference in files: diff --git a/pkgs/core/audit/audit.nm b/pkgs/core/audit/audit.nm new file mode 100644 index 0000000..c86b005 --- /dev/null +++ b/pkgs/core/audit/audit.nm @@ -0,0 +1,72 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = audit +PKG_VER = 2.0.5 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Daemons +PKG_URL = http://people.redhat.com/sgrubb/audit/ +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = User space tools for 2.6 kernel auditing. + +PKG_BUILD_DEPS+= autoconf automake libcap-ng-devel libtool openldap-devel \ + python-devel swig + +define PKG_DESCRIPTION + The audit package contains the user space utilities for \ + storing and searching the audit records generate by \ + the audit subsystem in the Linux 2.6 kernel. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME)-devel $(PKG_NAME)-libs + +CONFIGURE_OPTIONS += \ + --sysconfdir=/etc \ + --sbindir=/sbin \ + --libdir=/lib \ + --without-prelude \ + --without-libwrap \ + --enable-gssapi-krb5=no \ + --with-libcap-ng=yes + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && autoreconf -fvi +endef + +define STAGE_INSTALL_CMDS + rm -vf $(BUILDROOT)/lib/libau{dit,parse}.so + ln -svf ../../lib/libaudit.so.1 $(BUILDROOT)/usr/lib/libaudit.so + ln -svf ../../lib/libauparse.so.0 $(BUILDROOT)/usr/lib/libauparse.so + + -mkdir -pv $(BUILDROOT)/usr/sbin + mv -v $(BUILDROOT)/sbin/audisp*remote $(BUILDROOT)/usr/sbin/ + + rm -rfv $(BUILDROOT)/etc/{rc.d,sysconfig} +endef diff --git a/pkgs/core/hwdata/hwdata.nm b/pkgs/core/hwdata/hwdata.nm new file mode 100644 index 0000000..d4eb4f9 --- /dev/null +++ b/pkgs/core/hwdata/hwdata.nm @@ -0,0 +1,47 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = hwdata +PKG_VER = 0.232 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Base +PKG_URL = http://git.fedorahosted.org/git/hwdata.git +PKG_LICENSE = GPLv2+ and LGPLv2+ +PKG_SUMMARY = Hardware identification and configuration data. + +PKG_BUILD_DEPS = # Need no gcc +PKG_DEPS += module-init-tools + +define PKG_DESCRIPTION + hwdata contains various hardware identification and configuration data, \ + such as the pci.ids database and MonitorsDb databases. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +STAGE_BUILD = # Nothing to do diff --git a/pkgs/core/iscsi-initiator-utils/04-iscsi b/pkgs/core/iscsi-initiator-utils/04-iscsi new file mode 100755 index 0000000..58aa798 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/04-iscsi @@ -0,0 +1,17 @@ +#!/bin/sh + +export LC_ALL=C + +if [ "$2" = "down" ]; then + if ! /sbin/ip route ls | grep -q ^default && + [ -f /var/lock/subsys/iscsi ]; then + /etc/rc.d/init.d/iscsi stop + fi +fi + +if [ "$2" = "up" ]; then + if /sbin/ip -o route show dev "$1" | grep -q '^default' && + /sbin/chkconfig iscsi; then + /etc/rc.d/init.d/iscsi start + fi +fi diff --git a/pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm b/pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm new file mode 100644 index 0000000..b07c5c4 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/iscsi-initiator-utils.nm @@ -0,0 +1,102 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = iscsi-initiator-utils +PKG_VER = 6.2.0.872 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Networking/Tools +PKG_URL = http://bridge.sourceforge.net/ +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = iSCSI daemon and utility programs. + +PKG_BUILD_DEPS+= openssl-devel python-devel + +define PKG_DESCRIPTION + The iscsi package provides the server daemon for the iSCSI protocol, \ + as well as the utility programs used to manage it. iSCSI is a protocol \ + for distributed disk access using SCSI commands sent over Internet \ + Protocol networks. +endef + +PKG_PACKAGES += libiscsi libiscsi-devel + +define PKG_FILES-libiscsi + /usr/lib/libiscsi.so.* +endef + +define PKG_FILES-libiscsi-devel + /usr/lib/libiscsi.so + /usr/include +endef + +PKG_TARBALL = open-iscsi-2.0-872-rc4-bnx2i.tar.gz +DIR_APP = $(DIR_SRC)/open-iscsi-2.0-872-rc4-bnx2i + +define STAGE_PREPARE_CMDS + cd $(DIR_APP)/libiscsi && sed -e "s/^all.*/all: lib tests/" -i Makefile +endef + +define STAGE_BUILD + cd $(DIR_APP)/utils/open-isns && ./configure + cd $(DIR_APP)/utils/open-isns && make + cd $(DIR_APP) && make -C utils/sysdeps + cd $(DIR_APP) && make -C utils/fwparam_ibft + cd $(DIR_APP) && make -C usr + cd $(DIR_APP) && make -C utils + cd $(DIR_APP) && make -C libiscsi + cd $(DIR_APP)/libiscsi && python setup.py build +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/sbin + -mkdir -pv $(BUILDROOT)/usr/share/man/man8 + -mkdir -pv $(BUILDROOT)/etc/{iscsi,sysconfig} + -mkdir -pv $(BUILDROOT)/etc/NetworkManager/dispatcher.d + -mkdir -pv $(BUILDROOT)/var/lib/iscsi/{nodes,send_targets,static,isns,slp,ifaces} + -mkdir -pv $(BUILDROOT)/var/lock/iscsi + -mkdir -pv $(BUILDROOT)/usr/lib + -mkdir -pv $(BUILDROOT)/usr/include + -mkdir -pv $(BUILDROOT)/usr/lib/python2.7/site-packages + + cd $(DIR_APP) && install -p -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart \ + $(BUILDROOT)/sbin + cd $(DIR_APP) && install -p -m 644 doc/iscsiadm.8 $(BUILDROOT)/usr/share/man/man8 + cd $(DIR_APP) && install -p -m 644 doc/iscsid.8 $(BUILDROOT)/usr/share/man/man8 + cd $(DIR_APP) && install -p -m 644 etc/iscsid.conf $(BUILDROOT)/etc/sysconfig/iscsi + cd $(DIR_APP) && install -p -m 644 doc/iscsistart.8 $(BUILDROOT)/usr/share/man/man8 + cd $(DIR_APP) && install -p -m 644 doc/iscsi-iname.8 $(BUILDROOT)/usr/share/man/man8 + + cd $(DIR_APP) && install -p -m 755 $(DIR_SOURCE)/04-iscsi $(BUILDROOT)/etc/NetworkManager/dispatcher.d + + cd $(DIR_APP) && install -p -m 755 libiscsi/libiscsi.so.0 $(BUILDROOT)/usr/lib + ln -svf libiscsi.so.0 $(BUILDROOT)/usr/lib/libiscsi.so + cd $(DIR_APP) && install -p -m 644 libiscsi/libiscsi.h $(BUILDROOT)/usr/include + + cd $(DIR_APP) && install -p -m 755 libiscsi/build/lib.linux-*/libiscsimodule.so \ + $(BUILDROOT)/usr/lib/python2.7/site-packages +endef diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch new file mode 100644 index 0000000..4cc7db8 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-add-libiscsi.patch @@ -0,0 +1,3737 @@ +diff --git a/Makefile b/Makefile +index db460eb..a4d4ce0 100644 +--- a/Makefile ++++ b/Makefile +@@ -32,6 +32,7 @@ user: ; + $(MAKE) -C utils/fwparam_ibft + $(MAKE) -C usr + $(MAKE) -C utils ++ $(MAKE) -C libiscsi + @echo + @echo "Compilation complete Output file" + @echo "----------------------------------- ----------------" +@@ -53,6 +54,7 @@ kernel: force + force: ; + + clean: ++ $(MAKE) -C libiscsi clean + $(MAKE) -C utils/sysdeps clean + $(MAKE) -C utils/fwparam_ibft clean + $(MAKE) -C utils clean +diff --git a/libiscsi/Makefile b/libiscsi/Makefile +new file mode 100644 +index 0000000..4aeb44f +--- /dev/null ++++ b/libiscsi/Makefile +@@ -0,0 +1,62 @@ ++# This Makefile will work only with GNU make. ++ ++OSNAME=$(shell uname -s) ++OPTFLAGS ?= -O2 -g ++WARNFLAGS ?= -Wall -Wstrict-prototypes ++CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr -I../utils/open-isns \ ++ -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden ++LIB = libiscsi.so.0 ++TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware ++TESTS += tests/test_login tests/test_logout tests/test_params ++TESTS += tests/test_get_network_config tests/test_get_initiator_name ++TESTS += tests/test_set_auth tests/test_get_auth ++ ++COMMON_SRCS = sysdeps.o ++# sources shared between iscsid, iscsiadm and iscsistart ++ISCSI_LIB_SRCS = session_info.o iscsi_util.o io.o auth.o discovery.o login.o log.o md5.o sha1.o iface.o idbm.o sysfs.o iscsi_sysfs.o iscsi_net_util.o iscsid_req.o ++FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sysfs.o ++ ++# sources shared with the userspace utils, note we build these separately ++# to get PIC versions. ++COMMON_OBJS = $(patsubst %.o, common-objs/%.o, $(COMMON_SRCS)) ++USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) strings.o) ++FW_OBJS = $(patsubst %.o, fw-objs/%.o, $(FW_PARAM_SRCS)) ++ ++# Flags for the tests ++tests/% : CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I. ++ ++all: lib tests html ++ ++lib: $(LIB) ++tests: $(TESTS) ++ ++common-objs/%.o: ../utils/sysdeps/%.c ++ mkdir -p common-objs ++ $(CC) $(CFLAGS) -c $< -o $@ ++ ++usr-objs/%.o: ../usr/%.c ++ mkdir -p usr-objs ++ $(CC) $(CFLAGS) -c $< -o $@ ++ ++fw-objs/%.o: ../utils/fwparam_ibft/%.c ++ mkdir -p fw-objs ++ $(CC) $(CFLAGS) -c $< -o $@ ++ ++$(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o ++ $(CC) $(CFLAGS) -L../utils/open-isns -lisns -shared -Wl,-soname,$(LIB) $^ -o $@ ++ ln -s -f $(LIB) libiscsi.so ++ ++$(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB) ++ $(CC) $(CFLAGS) -L../utils/open-isns -lisns -c $< -o $@ ++ ++html: libiscsi.h libiscsi.doxy ++ doxygen libiscsi.doxy ++ ++clean: ++ rm -rf *.o common-objs usr-objs fw-objs libuip-objs libiscsi.so* \ ++ .depend *~ html $(TESTS) tests/*~ ++ ++depend: ++ gcc $(CFLAGS) -M `ls *.c` > .depend ++ ++-include .depend ../usr/.depend +diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c +new file mode 100644 +index 0000000..a9eb0a6 +--- /dev/null ++++ b/libiscsi/libiscsi.c +@@ -0,0 +1,563 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <errno.h> ++#include <unistd.h> ++#include <sys/syslog.h> ++#include "libiscsi.h" ++#include "idbm.h" ++#include "discovery.h" ++#include "log.h" ++#include "sysfs.h" ++#include "iscsi_sysfs.h" ++#include "session_info.h" ++#include "iscsi_util.h" ++#include "sysdeps.h" ++#include "iface.h" ++#include "iscsi_proto.h" ++#include "fw_context.h" ++#include "iscsid_req.h" ++ ++#define CHECK(a) { context->error_str[0] = 0; rc = a; if (rc) goto leave; } ++ ++struct libiscsi_context { ++ char error_str[256]; ++ /* For get_parameter_helper() */ ++ const char *parameter; ++ char *value; ++}; ++ ++static void libiscsi_log(int prio, void *priv, const char *fmt, va_list ap) ++{ ++ struct libiscsi_context *context = priv; ++ ++ if (prio > LOG_ERR) /* We are only interested in errors (or worse) */ ++ return; ++ ++ vsnprintf(context->error_str, sizeof(context->error_str), fmt, ap); ++} ++ ++struct libiscsi_context *libiscsi_init(void) ++{ ++ struct libiscsi_context *context; ++ ++ context = calloc(1, sizeof *context); ++ if (!context) ++ return NULL; ++ ++ log_init("libiscsi", 1024, libiscsi_log, context); ++ sysfs_init(); ++ increase_max_files(); ++ if (idbm_init(NULL)) { ++ sysfs_cleanup(); ++ free(context); ++ return NULL; ++ } ++ ++ iface_setup_host_bindings(); ++ ++ return context; ++} ++ ++void libiscsi_cleanup(struct libiscsi_context *context) ++{ ++ idbm_terminate(); ++ free_transports(); ++ sysfs_cleanup(); ++ free(context); ++} ++ ++static void free_rec_list(struct list_head *rec_list) ++{ ++ struct node_rec *rec, *tmp; ++ ++ list_for_each_entry_safe(rec, tmp, rec_list, list) { ++ list_del(&rec->list); ++ free(rec); ++ } ++} ++ ++int libiscsi_discover_sendtargets(struct libiscsi_context *context, ++ const char *address, int port, ++ const struct libiscsi_auth_info *auth_info, ++ int *nr_found, struct libiscsi_node **found_nodes) ++{ ++ struct discovery_rec drec; ++ LIST_HEAD(bound_rec_list); ++ struct node_rec *rec; ++ int rc = 0, found = 0; ++ ++ INIT_LIST_HEAD(&bound_rec_list); ++ ++ if (nr_found) ++ *nr_found = 0; ++ if (found_nodes) ++ *found_nodes = NULL; ++ ++ CHECK(libiscsi_verify_auth_info(context, auth_info)) ++ ++ /* Fill the drec struct with all needed info */ ++ memset(&drec, 0, sizeof drec); ++ idbm_sendtargets_defaults(&drec.u.sendtargets); ++ drec.type = DISCOVERY_TYPE_SENDTARGETS; ++ strlcpy(drec.address, address, sizeof(drec.address)); ++ drec.port = port ? port : ISCSI_LISTEN_PORT; ++ switch(auth_info ? auth_info->method : libiscsi_auth_none) { ++ case libiscsi_auth_chap: ++ drec.u.sendtargets.auth.authmethod = AUTH_METHOD_CHAP; ++ strlcpy(drec.u.sendtargets.auth.username, ++ auth_info->chap.username, AUTH_STR_MAX_LEN); ++ strlcpy((char *)drec.u.sendtargets.auth.password, ++ auth_info->chap.password, AUTH_STR_MAX_LEN); ++ drec.u.sendtargets.auth.password_length = ++ strlen((char *)drec.u.sendtargets.auth.password); ++ strlcpy(drec.u.sendtargets.auth.username_in, ++ auth_info->chap.reverse_username, AUTH_STR_MAX_LEN); ++ strlcpy((char *)drec.u.sendtargets.auth.password_in, ++ auth_info->chap.reverse_password, AUTH_STR_MAX_LEN); ++ drec.u.sendtargets.auth.password_in_length = ++ strlen((char *)drec.u.sendtargets.auth.password_in); ++ break; ++ } ++ ++ CHECK(idbm_add_discovery(&drec)) ++ ++ CHECK(idbm_bind_ifaces_to_nodes(discovery_sendtargets, ++ &drec, NULL, &bound_rec_list)) ++ ++ /* now add/update records */ ++ list_for_each_entry(rec, &bound_rec_list, list) { ++ CHECK(idbm_add_node(rec, &drec, 1 /* overwrite */)) ++ found++; ++ } ++ ++ if (nr_found) ++ *nr_found = found; ++ ++ if (found_nodes && found) { ++ *found_nodes = calloc(found, sizeof **found_nodes); ++ if (*found_nodes == NULL) { ++ snprintf(context->error_str, ++ sizeof(context->error_str), strerror(ENOMEM)); ++ rc = ENOMEM; ++ goto leave; ++ } ++ found = 0; ++ list_for_each_entry(rec, &bound_rec_list, list) { ++ strlcpy((*found_nodes)[found].name, rec->name, ++ LIBISCSI_VALUE_MAXLEN); ++ (*found_nodes)[found].tpgt = rec->tpgt; ++ strlcpy((*found_nodes)[found].address, ++ rec->conn[0].address, NI_MAXHOST); ++ (*found_nodes)[found].port = rec->conn[0].port; ++ found++; ++ } ++ } ++ ++leave: ++ free_rec_list(&bound_rec_list); ++ return rc; ++} ++ ++int libiscsi_discover_firmware(struct libiscsi_context *context, ++ int *nr_found, struct libiscsi_node **found_nodes) ++{ ++ struct boot_context fw_entry; ++ struct node_rec rec; ++ int rc = 0; ++ ++ if (nr_found) ++ *nr_found = 0; ++ if (found_nodes) ++ *found_nodes = NULL; ++ ++ memset(&fw_entry, 0, sizeof fw_entry); ++ rc = fw_get_entry(&fw_entry); ++ if (rc) { ++ strcpy(context->error_str, "Could not read fw values."); ++ return rc; ++ } ++ ++ memset(&rec, 0, sizeof rec); ++ idbm_node_setup_defaults(&rec); ++ ++ strlcpy(rec.name, fw_entry.targetname, TARGET_NAME_MAXLEN); ++ rec.tpgt = 1; ++ strlcpy(rec.conn[0].address, fw_entry.target_ipaddr, NI_MAXHOST); ++ rec.conn[0].port = fw_entry.target_port; ++ ++ iface_setup_defaults(&rec.iface); ++ strncpy(rec.iface.iname, fw_entry.initiatorname, ++ sizeof(fw_entry.initiatorname)); ++ strncpy(rec.session.auth.username, fw_entry.chap_name, ++ sizeof(fw_entry.chap_name)); ++ strncpy((char *)rec.session.auth.password, fw_entry.chap_password, ++ sizeof(fw_entry.chap_password)); ++ strncpy(rec.session.auth.username_in, fw_entry.chap_name_in, ++ sizeof(fw_entry.chap_name_in)); ++ strncpy((char *)rec.session.auth.password_in, ++ fw_entry.chap_password_in, ++ sizeof(fw_entry.chap_password_in)); ++ rec.session.auth.password_length = ++ strlen((char *)fw_entry.chap_password); ++ rec.session.auth.password_in_length = ++ strlen((char *)fw_entry.chap_password_in); ++ ++ CHECK(idbm_add_node(&rec, NULL, 1 /* overwrite */)) ++ ++ if (nr_found) ++ *nr_found = 1; ++ ++ if (found_nodes) { ++ *found_nodes = calloc(1, sizeof **found_nodes); ++ if (*found_nodes == NULL) { ++ snprintf(context->error_str, ++ sizeof(context->error_str), strerror(ENOMEM)); ++ rc = ENOMEM; ++ goto leave; ++ } ++ strlcpy((*found_nodes)[0].name, rec.name, ++ LIBISCSI_VALUE_MAXLEN); ++ (*found_nodes)[0].tpgt = rec.tpgt; ++ strlcpy((*found_nodes)[0].address, ++ rec.conn[0].address, NI_MAXHOST); ++ (*found_nodes)[0].port = rec.conn[0].port; ++ } ++ ++leave: ++ return rc; ++} ++ ++int libiscsi_verify_auth_info(struct libiscsi_context *context, ++ const struct libiscsi_auth_info *auth_info) ++{ ++ switch(auth_info ? auth_info->method : libiscsi_auth_none) { ++ case libiscsi_auth_none: ++ break; ++ case libiscsi_auth_chap: ++ if (!auth_info->chap.username[0]) { ++ strcpy(context->error_str, "Empty username"); ++ return EINVAL; ++ } ++ if (!auth_info->chap.password[0]) { ++ strcpy(context->error_str, "Empty password"); ++ return EINVAL; ++ } ++ if (auth_info->chap.reverse_username[0] && ++ !auth_info->chap.reverse_password[0]) { ++ strcpy(context->error_str, "Empty reverse password"); ++ return EINVAL; ++ } ++ break; ++ default: ++ sprintf(context->error_str, ++ "Invalid authentication method: %d", ++ (int)auth_info->method); ++ return EINVAL; ++ } ++ return 0; ++} ++ ++int libiscsi_node_set_auth(struct libiscsi_context *context, ++ const struct libiscsi_node *node, ++ const struct libiscsi_auth_info *auth_info) ++{ ++ int rc = 0; ++ ++ CHECK(libiscsi_verify_auth_info(context, auth_info)) ++ ++ switch(auth_info ? auth_info->method : libiscsi_auth_none) { ++ case libiscsi_auth_none: ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.authmethod", "None")) ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.username", "")) ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.password", "")) ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.username_in", "")) ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.password_in", "")) ++ break; ++ ++ case libiscsi_auth_chap: ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.authmethod", "CHAP")) ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.username", ++ auth_info->chap.username)) ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.password", ++ auth_info->chap.password)) ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.username_in", ++ auth_info->chap.reverse_username)) ++ CHECK(libiscsi_node_set_parameter(context, node, ++ "node.session.auth.password_in", ++ auth_info->chap.reverse_password)) ++ break; ++ } ++leave: ++ return rc; ++} ++ ++int libiscsi_node_get_auth(struct libiscsi_context *context, ++ const struct libiscsi_node *node, ++ struct libiscsi_auth_info *auth_info) ++{ ++ int rc = 0; ++ char value[LIBISCSI_VALUE_MAXLEN]; ++ ++ memset(auth_info, 0, sizeof *auth_info); ++ ++ CHECK(libiscsi_node_get_parameter(context, node, ++ "node.session.auth.authmethod", value)) ++ ++ if (!strcmp(value, "None")) { ++ auth_info->method = libiscsi_auth_none; ++ } else if (!strcmp(value, "CHAP")) { ++ auth_info->method = libiscsi_auth_chap; ++ CHECK(libiscsi_node_get_parameter(context, node, ++ "node.session.auth.username", ++ auth_info->chap.username)) ++ CHECK(libiscsi_node_get_parameter(context, node, ++ "node.session.auth.password", ++ auth_info->chap.password)) ++ CHECK(libiscsi_node_get_parameter(context, node, ++ "node.session.auth.username_in", ++ auth_info->chap.reverse_username)) ++ CHECK(libiscsi_node_get_parameter(context, node, ++ "node.session.auth.password_in", ++ auth_info->chap.reverse_password)) ++ } else { ++ snprintf(context->error_str, sizeof(context->error_str), ++ "unknown authentication method: %s", value); ++ rc = EINVAL; ++ } ++leave: ++ return rc; ++} ++ ++static void node_to_rec(const struct libiscsi_node *node, ++ struct node_rec *rec) ++{ ++ memset(rec, 0, sizeof *rec); ++ idbm_node_setup_defaults(rec); ++ strlcpy(rec->name, node->name, TARGET_NAME_MAXLEN); ++ rec->tpgt = node->tpgt; ++ strlcpy(rec->conn[0].address, node->address, NI_MAXHOST); ++ rec->conn[0].port = node->port; ++} ++ ++int login_helper(void *data, node_rec_t *rec) ++{ ++ int rc = iscsid_req_by_rec(MGMT_IPC_SESSION_LOGIN, rec); ++ if (rc) { ++ iscsid_handle_error(rc); ++ rc = ENOTCONN; ++ } ++ return rc; ++} ++ ++int libiscsi_node_login(struct libiscsi_context *context, ++ const struct libiscsi_node *node) ++{ ++ int nr_found = 0, rc; ++ ++ CHECK(idbm_for_each_iface(&nr_found, NULL, login_helper, ++ (char *)node->name, node->tpgt, ++ (char *)node->address, node->port)) ++ if (nr_found == 0) { ++ strcpy(context->error_str, "No such node"); ++ rc = ENODEV; ++ } ++leave: ++ return rc; ++} ++ ++static int logout_helper(void *data, struct session_info *info) ++{ ++ int rc; ++ struct node_rec *rec = data; ++ ++ if (!iscsi_match_session(rec, info)) ++ /* Tell iscsi_sysfs_for_each_session this session was not a ++ match so that it will not increase nr_found. */ ++ return -1; ++ ++ rc = iscsid_req_by_sid(MGMT_IPC_SESSION_LOGOUT, info->sid); ++ if (rc) { ++ iscsid_handle_error(rc); ++ rc = EIO; ++ } ++ ++ return rc; ++} ++ ++int libiscsi_node_logout(struct libiscsi_context *context, ++ const struct libiscsi_node *node) ++{ ++ int nr_found = 0, rc; ++ struct node_rec rec; ++ ++ node_to_rec(node, &rec); ++ CHECK(iscsi_sysfs_for_each_session(&rec, &nr_found, logout_helper)) ++ if (nr_found == 0) { ++ strcpy(context->error_str, "No matching session"); ++ rc = ENODEV; ++ } ++leave: ++ return rc; ++} ++ ++int libiscsi_node_set_parameter(struct libiscsi_context *context, ++ const struct libiscsi_node *node, ++ const char *parameter, const char *value) ++{ ++ int nr_found = 0, rc; ++ struct db_set_param set_param = { ++ .name = (char *)parameter, ++ .value = (char *)value, ++ }; ++ ++ CHECK(idbm_for_each_iface(&nr_found, &set_param, idbm_node_set_param, ++ (char *)node->name, node->tpgt, ++ (char *)node->address, node->port)) ++ if (nr_found == 0) { ++ strcpy(context->error_str, "No such node"); ++ rc = ENODEV; ++ } ++leave: ++ return rc; ++} ++ ++static int get_parameter_helper(void *data, node_rec_t *rec) ++{ ++ struct libiscsi_context *context = data; ++ recinfo_t *info; ++ int i; ++ ++ info = idbm_recinfo_alloc(MAX_KEYS); ++ if (!info) { ++ snprintf(context->error_str, sizeof(context->error_str), ++ strerror(ENOMEM)); ++ return ENOMEM; ++ } ++ ++ idbm_recinfo_node(rec, info); ++ ++ for (i = 0; i < MAX_KEYS; i++) { ++ if (!info[i].visible) ++ continue; ++ ++ if (strcmp(context->parameter, info[i].name)) ++ continue; ++ ++ strlcpy(context->value, info[i].value, LIBISCSI_VALUE_MAXLEN); ++ break; ++ } ++ ++ free(info); ++ ++ if (i == MAX_KEYS) { ++ strcpy(context->error_str, "No such parameter"); ++ return EINVAL; ++ } ++ ++ return 0; ++} ++ ++int libiscsi_node_get_parameter(struct libiscsi_context *context, ++ const struct libiscsi_node *node, const char *parameter, char *value) ++{ ++ int nr_found = 0, rc = 0; ++ ++ context->parameter = parameter; ++ context->value = value; ++ ++ /* Note we assume there is only one interface, if not we will get ++ the value from the last interface iterated over! ++ This (multiple interfaces) can only happen if someone explicitly ++ created ones using iscsiadm. Even then this should not be a problem ++ as most settings should be the same independent of the iface. */ ++ CHECK(idbm_for_each_iface(&nr_found, context, get_parameter_helper, ++ (char *)node->name, node->tpgt, ++ (char *)node->address, node->port)) ++ if (nr_found == 0) { ++ strcpy(context->error_str, "No such node"); ++ rc = ENODEV; ++ } ++leave: ++ return rc; ++} ++ ++const char *libiscsi_get_error_string(struct libiscsi_context *context) ++{ ++ /* Sometimes the core open-iscsi code does not give us an error ++ message */ ++ if (!context->error_str[0]) ++ return "Unknown error"; ++ ++ return context->error_str; ++} ++ ++ ++/************************** Utility functions *******************************/ ++ ++int libiscsi_get_firmware_network_config( ++ struct libiscsi_network_config *config) ++{ ++ struct boot_context fw_entry; ++ ++ memset(config, 0, sizeof *config); ++ memset(&fw_entry, 0, sizeof fw_entry); ++ if (fw_get_entry(&fw_entry)) ++ return ENODEV; ++ ++ config->dhcp = strlen(fw_entry.dhcp) ? 1 : 0; ++ strncpy(config->iface_name, fw_entry.iface, sizeof fw_entry.iface); ++ strncpy(config->mac_address, fw_entry.mac, sizeof fw_entry.mac); ++ strncpy(config->ip_address, fw_entry.ipaddr, sizeof fw_entry.ipaddr); ++ strncpy(config->netmask, fw_entry.mask, sizeof fw_entry.mask); ++ strncpy(config->gateway, fw_entry.gateway, sizeof fw_entry.gateway); ++ strncpy(config->primary_dns, fw_entry.primary_dns, ++ sizeof fw_entry.primary_dns); ++ strncpy(config->secondary_dns, fw_entry.secondary_dns, ++ sizeof fw_entry.secondary_dns); ++ return 0; ++} ++ ++int libiscsi_get_firmware_initiator_name(char *initiatorname) ++{ ++ struct boot_context fw_entry; ++ ++ memset(initiatorname, 0, LIBISCSI_VALUE_MAXLEN); ++ memset(&fw_entry, 0, sizeof fw_entry); ++ if (fw_get_entry(&fw_entry)) ++ return ENODEV; ++ ++ strncpy(initiatorname, fw_entry.initiatorname, ++ sizeof fw_entry.initiatorname); ++ ++ return 0; ++} +diff --git a/libiscsi/libiscsi.doxy b/libiscsi/libiscsi.doxy +new file mode 100644 +index 0000000..663770f +--- /dev/null ++++ b/libiscsi/libiscsi.doxy +@@ -0,0 +1,1473 @@ ++# Doxyfile 1.5.7.1 ++ ++# This file describes the settings to be used by the documentation system ++# doxygen (www.doxygen.org) for a project ++# ++# All text after a hash (#) is considered a comment and will be ignored ++# The format is: ++# TAG = value [value, ...] ++# For lists items can also be appended using: ++# TAG += value [value, ...] ++# Values that contain spaces should be placed between quotes (" ") ++ ++#--------------------------------------------------------------------------- ++# Project related configuration options ++#--------------------------------------------------------------------------- ++ ++# This tag specifies the encoding used for all characters in the config file ++# that follow. The default is UTF-8 which is also the encoding used for all ++# text before the first occurrence of this tag. Doxygen uses libiconv (or the ++# iconv built into libc) for the transcoding. See ++# http://www.gnu.org/software/libiconv for the list of possible encodings. ++ ++DOXYFILE_ENCODING = UTF-8 ++ ++# The PROJECT_NAME tag is a single word (or a sequence of words surrounded ++# by quotes) that should identify the project. ++ ++PROJECT_NAME = libiscsi ++ ++# The PROJECT_NUMBER tag can be used to enter a project or revision number. ++# This could be handy for archiving the generated documentation or ++# if some version control system is used. ++ ++PROJECT_NUMBER = ++ ++# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) ++# base path where the generated documentation will be put. ++# If a relative path is entered, it will be relative to the location ++# where doxygen was started. If left blank the current directory will be used. ++ ++OUTPUT_DIRECTORY = ++ ++# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create ++# 4096 sub-directories (in 2 levels) under the output directory of each output ++# format and will distribute the generated files over these directories. ++# Enabling this option can be useful when feeding doxygen a huge amount of ++# source files, where putting all generated files in the same directory would ++# otherwise cause performance problems for the file system. ++ ++CREATE_SUBDIRS = NO ++ ++# The OUTPUT_LANGUAGE tag is used to specify the language in which all ++# documentation generated by doxygen is written. Doxygen will use this ++# information to generate all constant output in the proper language. ++# The default language is English, other supported languages are: ++# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, ++# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, ++# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), ++# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, ++# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, ++# Spanish, Swedish, and Ukrainian. ++ ++OUTPUT_LANGUAGE = English ++ ++# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will ++# include brief member descriptions after the members that are listed in ++# the file and class documentation (similar to JavaDoc). ++# Set to NO to disable this. ++ ++BRIEF_MEMBER_DESC = YES ++ ++# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend ++# the brief description of a member or function before the detailed description. ++# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the ++# brief descriptions will be completely suppressed. ++ ++REPEAT_BRIEF = NO ++ ++# This tag implements a quasi-intelligent brief description abbreviator ++# that is used to form the text in various listings. Each string ++# in this list, if found as the leading text of the brief description, will be ++# stripped from the text and the result after processing the whole list, is ++# used as the annotated text. Otherwise, the brief description is used as-is. ++# If left blank, the following values are used ("$name" is automatically ++# replaced with the name of the entity): "The $name class" "The $name widget" ++# "The $name file" "is" "provides" "specifies" "contains" ++# "represents" "a" "an" "the" ++ ++ABBREVIATE_BRIEF = ++ ++# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then ++# Doxygen will generate a detailed section even if there is only a brief ++# description. ++ ++ALWAYS_DETAILED_SEC = YES ++ ++# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all ++# inherited members of a class in the documentation of that class as if those ++# members were ordinary class members. Constructors, destructors and assignment ++# operators of the base classes will not be shown. ++ ++INLINE_INHERITED_MEMB = NO ++ ++# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full ++# path before files name in the file list and in the header files. If set ++# to NO the shortest path that makes the file name unique will be used. ++ ++FULL_PATH_NAMES = YES ++ ++# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag ++# can be used to strip a user-defined part of the path. Stripping is ++# only done if one of the specified strings matches the left-hand part of ++# the path. The tag can be used to show relative paths in the file list. ++# If left blank the directory from which doxygen is run is used as the ++# path to strip. ++ ++STRIP_FROM_PATH = ++ ++# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of ++# the path mentioned in the documentation of a class, which tells ++# the reader which header file to include in order to use a class. ++# If left blank only the name of the header file containing the class ++# definition is used. Otherwise one should specify the include paths that ++# are normally passed to the compiler using the -I flag. ++ ++STRIP_FROM_INC_PATH = ++ ++# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter ++# (but less readable) file names. This can be useful is your file systems ++# doesn't support long names like on DOS, Mac, or CD-ROM. ++ ++SHORT_NAMES = NO ++ ++# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen ++# will interpret the first line (until the first dot) of a JavaDoc-style ++# comment as the brief description. If set to NO, the JavaDoc ++# comments will behave just like regular Qt-style comments ++# (thus requiring an explicit @brief command for a brief description.) ++ ++JAVADOC_AUTOBRIEF = NO ++ ++# If the QT_AUTOBRIEF tag is set to YES then Doxygen will ++# interpret the first line (until the first dot) of a Qt-style ++# comment as the brief description. If set to NO, the comments ++# will behave just like regular Qt-style comments (thus requiring ++# an explicit \brief command for a brief description.) ++ ++QT_AUTOBRIEF = NO ++ ++# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen ++# treat a multi-line C++ special comment block (i.e. a block of //! or /// ++# comments) as a brief description. This used to be the default behaviour. ++# The new default is to treat a multi-line C++ comment block as a detailed ++# description. Set this tag to YES if you prefer the old behaviour instead. ++ ++MULTILINE_CPP_IS_BRIEF = NO ++ ++# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented ++# member inherits the documentation from any documented member that it ++# re-implements. ++ ++INHERIT_DOCS = YES ++ ++# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce ++# a new page for each member. If set to NO, the documentation of a member will ++# be part of the file/class/namespace that contains it. ++ ++SEPARATE_MEMBER_PAGES = NO ++ ++# The TAB_SIZE tag can be used to set the number of spaces in a tab. ++# Doxygen uses this value to replace tabs by spaces in code fragments. ++ ++TAB_SIZE = 8 ++ ++# This tag can be used to specify a number of aliases that acts ++# as commands in the documentation. An alias has the form "name=value". ++# For example adding "sideeffect=\par Side Effects:\n" will allow you to ++# put the command \sideeffect (or @sideeffect) in the documentation, which ++# will result in a user-defined paragraph with heading "Side Effects:". ++# You can put \n's in the value part of an alias to insert newlines. ++ ++ALIASES = ++ ++# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C ++# sources only. Doxygen will then generate output that is more tailored for C. ++# For instance, some of the names that are used will be different. The list ++# of all members will be omitted, etc. ++ ++OPTIMIZE_OUTPUT_FOR_C = YES ++ ++# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java ++# sources only. Doxygen will then generate output that is more tailored for ++# Java. For instance, namespaces will be presented as packages, qualified ++# scopes will look different, etc. ++ ++OPTIMIZE_OUTPUT_JAVA = NO ++ ++# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran ++# sources only. Doxygen will then generate output that is more tailored for ++# Fortran. ++ ++OPTIMIZE_FOR_FORTRAN = NO ++ ++# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL ++# sources. Doxygen will then generate output that is tailored for ++# VHDL. ++ ++OPTIMIZE_OUTPUT_VHDL = NO ++ ++# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want ++# to include (a tag file for) the STL sources as input, then you should ++# set this tag to YES in order to let doxygen match functions declarations and ++# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. ++# func(std::string) {}). This also make the inheritance and collaboration ++# diagrams that involve STL classes more complete and accurate. ++ ++BUILTIN_STL_SUPPORT = NO ++ ++# If you use Microsoft's C++/CLI language, you should set this option to YES to ++# enable parsing support. ++ ++CPP_CLI_SUPPORT = NO ++ ++# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. ++# Doxygen will parse them like normal C++ but will assume all classes use public ++# instead of private inheritance when no explicit protection keyword is present. ++ ++SIP_SUPPORT = NO ++ ++# For Microsoft's IDL there are propget and propput attributes to indicate getter ++# and setter methods for a property. Setting this option to YES (the default) ++# will make doxygen to replace the get and set methods by a property in the ++# documentation. This will only work if the methods are indeed getting or ++# setting a simple type. If this is not the case, or you want to show the ++# methods anyway, you should set this option to NO. ++ ++IDL_PROPERTY_SUPPORT = YES ++ ++# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC ++# tag is set to YES, then doxygen will reuse the documentation of the first ++# member in the group (if any) for the other members of the group. By default ++# all members of a group must be documented explicitly. ++ ++DISTRIBUTE_GROUP_DOC = NO ++ ++# Set the SUBGROUPING tag to YES (the default) to allow class member groups of ++# the same type (for instance a group of public functions) to be put as a ++# subgroup of that type (e.g. under the Public Functions section). Set it to ++# NO to prevent subgrouping. Alternatively, this can be done per class using ++# the \nosubgrouping command. ++ ++SUBGROUPING = YES ++ ++# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum ++# is documented as struct, union, or enum with the name of the typedef. So ++# typedef struct TypeS {} TypeT, will appear in the documentation as a struct ++# with name TypeT. When disabled the typedef will appear as a member of a file, ++# namespace, or class. And the struct will be named TypeS. This can typically ++# be useful for C code in case the coding convention dictates that all compound ++# types are typedef'ed and only the typedef is referenced, never the tag name. ++ ++TYPEDEF_HIDES_STRUCT = NO ++ ++# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to ++# determine which symbols to keep in memory and which to flush to disk. ++# When the cache is full, less often used symbols will be written to disk. ++# For small to medium size projects (<1000 input files) the default value is ++# probably good enough. For larger projects a too small cache size can cause ++# doxygen to be busy swapping symbols to and from disk most of the time ++# causing a significant performance penality. ++# If the system has enough physical memory increasing the cache will improve the ++# performance by keeping more symbols in memory. Note that the value works on ++# a logarithmic scale so increasing the size by one will rougly double the ++# memory usage. The cache size is given by this formula: ++# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, ++# corresponding to a cache size of 2^16 = 65536 symbols ++ ++SYMBOL_CACHE_SIZE = 0 ++ ++#--------------------------------------------------------------------------- ++# Build related configuration options ++#--------------------------------------------------------------------------- ++ ++# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in ++# documentation are documented, even if no documentation was available. ++# Private class members and static file members will be hidden unless ++# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES ++ ++EXTRACT_ALL = YES ++ ++# If the EXTRACT_PRIVATE tag is set to YES all private members of a class ++# will be included in the documentation. ++ ++EXTRACT_PRIVATE = NO ++ ++# If the EXTRACT_STATIC tag is set to YES all static members of a file ++# will be included in the documentation. ++ ++EXTRACT_STATIC = NO ++ ++# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) ++# defined locally in source files will be included in the documentation. ++# If set to NO only classes defined in header files are included. ++ ++EXTRACT_LOCAL_CLASSES = YES ++ ++# This flag is only useful for Objective-C code. When set to YES local ++# methods, which are defined in the implementation section but not in ++# the interface are included in the documentation. ++# If set to NO (the default) only methods in the interface are included. ++ ++EXTRACT_LOCAL_METHODS = NO ++ ++# If this flag is set to YES, the members of anonymous namespaces will be ++# extracted and appear in the documentation as a namespace called ++# 'anonymous_namespace{file}', where file will be replaced with the base ++# name of the file that contains the anonymous namespace. By default ++# anonymous namespace are hidden. ++ ++EXTRACT_ANON_NSPACES = NO ++ ++# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all ++# undocumented members of documented classes, files or namespaces. ++# If set to NO (the default) these members will be included in the ++# various overviews, but no documentation section is generated. ++# This option has no effect if EXTRACT_ALL is enabled. ++ ++HIDE_UNDOC_MEMBERS = NO ++ ++# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all ++# undocumented classes that are normally visible in the class hierarchy. ++# If set to NO (the default) these classes will be included in the various ++# overviews. This option has no effect if EXTRACT_ALL is enabled. ++ ++HIDE_UNDOC_CLASSES = NO ++ ++# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all ++# friend (class|struct|union) declarations. ++# If set to NO (the default) these declarations will be included in the ++# documentation. ++ ++HIDE_FRIEND_COMPOUNDS = NO ++ ++# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any ++# documentation blocks found inside the body of a function. ++# If set to NO (the default) these blocks will be appended to the ++# function's detailed documentation block. ++ ++HIDE_IN_BODY_DOCS = NO ++ ++# The INTERNAL_DOCS tag determines if documentation ++# that is typed after a \internal command is included. If the tag is set ++# to NO (the default) then the documentation will be excluded. ++# Set it to YES to include the internal documentation. ++ ++INTERNAL_DOCS = NO ++ ++# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate ++# file names in lower-case letters. If set to YES upper-case letters are also ++# allowed. This is useful if you have classes or files whose names only differ ++# in case and if your file system supports case sensitive file names. Windows ++# and Mac users are advised to set this option to NO. ++ ++CASE_SENSE_NAMES = YES ++ ++# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen ++# will show members with their full class and namespace scopes in the ++# documentation. If set to YES the scope will be hidden. ++ ++HIDE_SCOPE_NAMES = NO ++ ++# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen ++# will put a list of the files that are included by a file in the documentation ++# of that file. ++ ++SHOW_INCLUDE_FILES = YES ++ ++# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] ++# is inserted in the documentation for inline members. ++ ++INLINE_INFO = YES ++ ++# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen ++# will sort the (detailed) documentation of file and class members ++# alphabetically by member name. If set to NO the members will appear in ++# declaration order. ++ ++SORT_MEMBER_DOCS = YES ++ ++# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the ++# brief documentation of file, namespace and class members alphabetically ++# by member name. If set to NO (the default) the members will appear in ++# declaration order. ++ ++SORT_BRIEF_DOCS = NO ++ ++# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the ++# hierarchy of group names into alphabetical order. If set to NO (the default) ++# the group names will appear in their defined order. ++ ++SORT_GROUP_NAMES = NO ++ ++# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be ++# sorted by fully-qualified names, including namespaces. If set to ++# NO (the default), the class list will be sorted only by class name, ++# not including the namespace part. ++# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. ++# Note: This option applies only to the class list, not to the ++# alphabetical list. ++ ++SORT_BY_SCOPE_NAME = NO ++ ++# The GENERATE_TODOLIST tag can be used to enable (YES) or ++# disable (NO) the todo list. This list is created by putting \todo ++# commands in the documentation. ++ ++GENERATE_TODOLIST = YES ++ ++# The GENERATE_TESTLIST tag can be used to enable (YES) or ++# disable (NO) the test list. This list is created by putting \test ++# commands in the documentation. ++ ++GENERATE_TESTLIST = YES ++ ++# The GENERATE_BUGLIST tag can be used to enable (YES) or ++# disable (NO) the bug list. This list is created by putting \bug ++# commands in the documentation. ++ ++GENERATE_BUGLIST = YES ++ ++# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or ++# disable (NO) the deprecated list. This list is created by putting ++# \deprecated commands in the documentation. ++ ++GENERATE_DEPRECATEDLIST= YES ++ ++# The ENABLED_SECTIONS tag can be used to enable conditional ++# documentation sections, marked by \if sectionname ... \endif. ++ ++ENABLED_SECTIONS = ++ ++# The MAX_INITIALIZER_LINES tag determines the maximum number of lines ++# the initial value of a variable or define consists of for it to appear in ++# the documentation. If the initializer consists of more lines than specified ++# here it will be hidden. Use a value of 0 to hide initializers completely. ++# The appearance of the initializer of individual variables and defines in the ++# documentation can be controlled using \showinitializer or \hideinitializer ++# command in the documentation regardless of this setting. ++ ++MAX_INITIALIZER_LINES = 30 ++ ++# Set the SHOW_USED_FILES tag to NO to disable the list of files generated ++# at the bottom of the documentation of classes and structs. If set to YES the ++# list will mention the files that were used to generate the documentation. ++ ++SHOW_USED_FILES = YES ++ ++# If the sources in your project are distributed over multiple directories ++# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy ++# in the documentation. The default is NO. ++ ++SHOW_DIRECTORIES = NO ++ ++# Set the SHOW_FILES tag to NO to disable the generation of the Files page. ++# This will remove the Files entry from the Quick Index and from the ++# Folder Tree View (if specified). The default is YES. ++ ++SHOW_FILES = YES ++ ++# Set the SHOW_NAMESPACES tag to NO to disable the generation of the ++# Namespaces page. This will remove the Namespaces entry from the Quick Index ++# and from the Folder Tree View (if specified). The default is YES. ++ ++SHOW_NAMESPACES = YES ++ ++# The FILE_VERSION_FILTER tag can be used to specify a program or script that ++# doxygen should invoke to get the current version for each file (typically from ++# the version control system). Doxygen will invoke the program by executing (via ++# popen()) the command <command> <input-file>, where <command> is the value of ++# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file ++# provided by doxygen. Whatever the program writes to standard output ++# is used as the file version. See the manual for examples. ++ ++FILE_VERSION_FILTER = ++ ++# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by ++# doxygen. The layout file controls the global structure of the generated output files ++# in an output format independent way. The create the layout file that represents ++# doxygen's defaults, run doxygen with the -l option. You can optionally specify a ++# file name after the option, if omitted DoxygenLayout.xml will be used as the name ++# of the layout file. ++ ++LAYOUT_FILE = ++ ++#--------------------------------------------------------------------------- ++# configuration options related to warning and progress messages ++#--------------------------------------------------------------------------- ++ ++# The QUIET tag can be used to turn on/off the messages that are generated ++# by doxygen. Possible values are YES and NO. If left blank NO is used. ++ ++QUIET = YES ++ ++# The WARNINGS tag can be used to turn on/off the warning messages that are ++# generated by doxygen. Possible values are YES and NO. If left blank ++# NO is used. ++ ++WARNINGS = YES ++ ++# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings ++# for undocumented members. If EXTRACT_ALL is set to YES then this flag will ++# automatically be disabled. ++ ++WARN_IF_UNDOCUMENTED = YES ++ ++# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for ++# potential errors in the documentation, such as not documenting some ++# parameters in a documented function, or documenting parameters that ++# don't exist or using markup commands wrongly. ++ ++WARN_IF_DOC_ERROR = YES ++ ++# This WARN_NO_PARAMDOC option can be abled to get warnings for ++# functions that are documented, but have no documentation for their parameters ++# or return value. If set to NO (the default) doxygen will only warn about ++# wrong or incomplete parameter documentation, but not about the absence of ++# documentation. ++ ++WARN_NO_PARAMDOC = NO ++ ++# The WARN_FORMAT tag determines the format of the warning messages that ++# doxygen can produce. The string should contain the $file, $line, and $text ++# tags, which will be replaced by the file and line number from which the ++# warning originated and the warning text. Optionally the format may contain ++# $version, which will be replaced by the version of the file (if it could ++# be obtained via FILE_VERSION_FILTER) ++ ++WARN_FORMAT = "$file:$line: $text" ++ ++# The WARN_LOGFILE tag can be used to specify a file to which warning ++# and error messages should be written. If left blank the output is written ++# to stderr. ++ ++WARN_LOGFILE = ++ ++#--------------------------------------------------------------------------- ++# configuration options related to the input files ++#--------------------------------------------------------------------------- ++ ++# The INPUT tag can be used to specify the files and/or directories that contain ++# documented source files. You may enter file names like "myfile.cpp" or ++# directories like "/usr/src/myproject". Separate the files or directories ++# with spaces. ++ ++INPUT = ++ ++# This tag can be used to specify the character encoding of the source files ++# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is ++# also the default input encoding. Doxygen uses libiconv (or the iconv built ++# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for ++# the list of possible encodings. ++ ++INPUT_ENCODING = UTF-8 ++ ++# If the value of the INPUT tag contains directories, you can use the ++# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp ++# and *.h) to filter out the source-files in the directories. If left ++# blank the following patterns are tested: ++# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx ++# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 ++ ++FILE_PATTERNS = ++ ++# The RECURSIVE tag can be used to turn specify whether or not subdirectories ++# should be searched for input files as well. Possible values are YES and NO. ++# If left blank NO is used. ++ ++RECURSIVE = NO ++ ++# The EXCLUDE tag can be used to specify files and/or directories that should ++# excluded from the INPUT source files. This way you can easily exclude a ++# subdirectory from a directory tree whose root is specified with the INPUT tag. ++ ++EXCLUDE = ++ ++# The EXCLUDE_SYMLINKS tag can be used select whether or not files or ++# directories that are symbolic links (a Unix filesystem feature) are excluded ++# from the input. ++ ++EXCLUDE_SYMLINKS = NO ++ ++# If the value of the INPUT tag contains directories, you can use the ++# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude ++# certain files from those directories. Note that the wildcards are matched ++# against the file with absolute path, so to exclude all test directories ++# for example use the pattern */test/* ++ ++EXCLUDE_PATTERNS = ++ ++# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names ++# (namespaces, classes, functions, etc.) that should be excluded from the ++# output. The symbol name can be a fully qualified name, a word, or if the ++# wildcard * is used, a substring. Examples: ANamespace, AClass, ++# AClass::ANamespace, ANamespace::*Test ++ ++EXCLUDE_SYMBOLS = ++ ++# The EXAMPLE_PATH tag can be used to specify one or more files or ++# directories that contain example code fragments that are included (see ++# the \include command). ++ ++EXAMPLE_PATH = ++ ++# If the value of the EXAMPLE_PATH tag contains directories, you can use the ++# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp ++# and *.h) to filter out the source-files in the directories. If left ++# blank all files are included. ++ ++EXAMPLE_PATTERNS = ++ ++# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be ++# searched for input files to be used with the \include or \dontinclude ++# commands irrespective of the value of the RECURSIVE tag. ++# Possible values are YES and NO. If left blank NO is used. ++ ++EXAMPLE_RECURSIVE = NO ++ ++# The IMAGE_PATH tag can be used to specify one or more files or ++# directories that contain image that are included in the documentation (see ++# the \image command). ++ ++IMAGE_PATH = ++ ++# The INPUT_FILTER tag can be used to specify a program that doxygen should ++# invoke to filter for each input file. Doxygen will invoke the filter program ++# by executing (via popen()) the command <filter> <input-file>, where <filter> ++# is the value of the INPUT_FILTER tag, and <input-file> is the name of an ++# input file. Doxygen will then use the output that the filter program writes ++# to standard output. If FILTER_PATTERNS is specified, this tag will be ++# ignored. ++ ++INPUT_FILTER = ++ ++# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern ++# basis. Doxygen will compare the file name with each pattern and apply the ++# filter if there is a match. The filters are a list of the form: ++# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further ++# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER ++# is applied to all files. ++ ++FILTER_PATTERNS = ++ ++# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using ++# INPUT_FILTER) will be used to filter the input files when producing source ++# files to browse (i.e. when SOURCE_BROWSER is set to YES). ++ ++FILTER_SOURCE_FILES = NO ++ ++#--------------------------------------------------------------------------- ++# configuration options related to source browsing ++#--------------------------------------------------------------------------- ++ ++# If the SOURCE_BROWSER tag is set to YES then a list of source files will ++# be generated. Documented entities will be cross-referenced with these sources. ++# Note: To get rid of all source code in the generated output, make sure also ++# VERBATIM_HEADERS is set to NO. ++ ++SOURCE_BROWSER = NO ++ ++# Setting the INLINE_SOURCES tag to YES will include the body ++# of functions and classes directly in the documentation. ++ ++INLINE_SOURCES = NO ++ ++# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct ++# doxygen to hide any special comment blocks from generated source code ++# fragments. Normal C and C++ comments will always remain visible. ++ ++STRIP_CODE_COMMENTS = YES ++ ++# If the REFERENCED_BY_RELATION tag is set to YES ++# then for each documented function all documented ++# functions referencing it will be listed. ++ ++REFERENCED_BY_RELATION = NO ++ ++# If the REFERENCES_RELATION tag is set to YES ++# then for each documented function all documented entities ++# called/used by that function will be listed. ++ ++REFERENCES_RELATION = NO ++ ++# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) ++# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from ++# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will ++# link to the source code. Otherwise they will link to the documentstion. ++ ++REFERENCES_LINK_SOURCE = YES ++ ++# If the USE_HTAGS tag is set to YES then the references to source code ++# will point to the HTML generated by the htags(1) tool instead of doxygen ++# built-in source browser. The htags tool is part of GNU's global source ++# tagging system (see http://www.gnu.org/software/global/global.html). You ++# will need version 4.8.6 or higher. ++ ++USE_HTAGS = NO ++ ++# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen ++# will generate a verbatim copy of the header file for each class for ++# which an include is specified. Set to NO to disable this. ++ ++VERBATIM_HEADERS = YES ++ ++#--------------------------------------------------------------------------- ++# configuration options related to the alphabetical class index ++#--------------------------------------------------------------------------- ++ ++# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index ++# of all compounds will be generated. Enable this if the project ++# contains a lot of classes, structs, unions or interfaces. ++ ++ALPHABETICAL_INDEX = NO ++ ++# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then ++# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns ++# in which this list will be split (can be a number in the range [1..20]) ++ ++COLS_IN_ALPHA_INDEX = 5 ++ ++# In case all classes in a project start with a common prefix, all ++# classes will be put under the same header in the alphabetical index. ++# The IGNORE_PREFIX tag can be used to specify one or more prefixes that ++# should be ignored while generating the index headers. ++ ++IGNORE_PREFIX = ++ ++#--------------------------------------------------------------------------- ++# configuration options related to the HTML output ++#--------------------------------------------------------------------------- ++ ++# If the GENERATE_HTML tag is set to YES (the default) Doxygen will ++# generate HTML output. ++ ++GENERATE_HTML = YES ++ ++# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. ++# If a relative path is entered the value of OUTPUT_DIRECTORY will be ++# put in front of it. If left blank `html' will be used as the default path. ++ ++HTML_OUTPUT = html ++ ++# The HTML_FILE_EXTENSION tag can be used to specify the file extension for ++# each generated HTML page (for example: .htm,.php,.asp). If it is left blank ++# doxygen will generate files with .html extension. ++ ++HTML_FILE_EXTENSION = .html ++ ++# The HTML_HEADER tag can be used to specify a personal HTML header for ++# each generated HTML page. If it is left blank doxygen will generate a ++# standard header. ++ ++HTML_HEADER = ++ ++# The HTML_FOOTER tag can be used to specify a personal HTML footer for ++# each generated HTML page. If it is left blank doxygen will generate a ++# standard footer. ++ ++HTML_FOOTER = ++ ++# The HTML_STYLESHEET tag can be used to specify a user-defined cascading ++# style sheet that is used by each HTML page. It can be used to ++# fine-tune the look of the HTML output. If the tag is left blank doxygen ++# will generate a default style sheet. Note that doxygen will try to copy ++# the style sheet file to the HTML output directory, so don't put your own ++# stylesheet in the HTML output directory as well, or it will be erased! ++ ++HTML_STYLESHEET = ++ ++# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, ++# files or namespaces will be aligned in HTML using tables. If set to ++# NO a bullet list will be used. ++ ++HTML_ALIGN_MEMBERS = YES ++ ++# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML ++# documentation will contain sections that can be hidden and shown after the ++# page has loaded. For this to work a browser that supports ++# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox ++# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). ++ ++HTML_DYNAMIC_SECTIONS = NO ++ ++# If the GENERATE_DOCSET tag is set to YES, additional index files ++# will be generated that can be used as input for Apple's Xcode 3 ++# integrated development environment, introduced with OSX 10.5 (Leopard). ++# To create a documentation set, doxygen will generate a Makefile in the ++# HTML output directory. Running make will produce the docset in that ++# directory and running "make install" will install the docset in ++# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find ++# it at startup. ++# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. ++ ++GENERATE_DOCSET = NO ++ ++# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the ++# feed. A documentation feed provides an umbrella under which multiple ++# documentation sets from a single provider (such as a company or product suite) ++# can be grouped. ++ ++DOCSET_FEEDNAME = "Doxygen generated docs" ++ ++# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that ++# should uniquely identify the documentation set bundle. This should be a ++# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen ++# will append .docset to the name. ++ ++DOCSET_BUNDLE_ID = org.doxygen.Project ++ ++# If the GENERATE_HTMLHELP tag is set to YES, additional index files ++# will be generated that can be used as input for tools like the ++# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) ++# of the generated HTML documentation. ++ ++GENERATE_HTMLHELP = NO ++ ++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can ++# be used to specify the file name of the resulting .chm file. You ++# can add a path in front of the file if the result should not be ++# written to the html output directory. ++ ++CHM_FILE = ++ ++# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can ++# be used to specify the location (absolute path including file name) of ++# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run ++# the HTML help compiler on the generated index.hhp. ++ ++HHC_LOCATION = ++ ++# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag ++# controls if a separate .chi index file is generated (YES) or that ++# it should be included in the master .chm file (NO). ++ ++GENERATE_CHI = NO ++ ++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING ++# is used to encode HtmlHelp index (hhk), content (hhc) and project file ++# content. ++ ++CHM_INDEX_ENCODING = ++ ++# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag ++# controls whether a binary table of contents is generated (YES) or a ++# normal table of contents (NO) in the .chm file. ++ ++BINARY_TOC = NO ++ ++# The TOC_EXPAND flag can be set to YES to add extra items for group members ++# to the contents of the HTML help documentation and to the tree view. ++ ++TOC_EXPAND = NO ++ ++# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER ++# are set, an additional index file will be generated that can be used as input for ++# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated ++# HTML documentation. ++ ++GENERATE_QHP = NO ++ ++# If the QHG_LOCATION tag is specified, the QCH_FILE tag can ++# be used to specify the file name of the resulting .qch file. ++# The path specified is relative to the HTML output folder. ++ ++QCH_FILE = ++ ++# The QHP_NAMESPACE tag specifies the namespace to use when generating ++# Qt Help Project output. For more information please see ++# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>. ++ ++QHP_NAMESPACE = org.doxygen.Project ++ ++# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating ++# Qt Help Project output. For more information please see ++# <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>. ++ ++QHP_VIRTUAL_FOLDER = doc ++ ++# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can ++# be used to specify the location of Qt's qhelpgenerator. ++# If non-empty doxygen will try to run qhelpgenerator on the generated ++# .qhp file . ++ ++QHG_LOCATION = ++ ++# The DISABLE_INDEX tag can be used to turn on/off the condensed index at ++# top of each HTML page. The value NO (the default) enables the index and ++# the value YES disables it. ++ ++DISABLE_INDEX = NO ++ ++# This tag can be used to set the number of enum values (range [1..20]) ++# that doxygen will group on one line in the generated HTML documentation. ++ ++ENUM_VALUES_PER_LINE = 4 ++ ++# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index ++# structure should be generated to display hierarchical information. ++# If the tag value is set to FRAME, a side panel will be generated ++# containing a tree-like index structure (just like the one that ++# is generated for HTML Help). For this to work a browser that supports ++# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, ++# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are ++# probably better off using the HTML help feature. Other possible values ++# for this tag are: HIERARCHIES, which will generate the Groups, Directories, ++# and Class Hierarchy pages using a tree view instead of an ordered list; ++# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which ++# disables this behavior completely. For backwards compatibility with previous ++# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE ++# respectively. ++ ++GENERATE_TREEVIEW = NONE ++ ++# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be ++# used to set the initial width (in pixels) of the frame in which the tree ++# is shown. ++ ++TREEVIEW_WIDTH = 250 ++ ++# Use this tag to change the font size of Latex formulas included ++# as images in the HTML documentation. The default is 10. Note that ++# when you change the font size after a successful doxygen run you need ++# to manually remove any form_*.png images from the HTML output directory ++# to force them to be regenerated. ++ ++FORMULA_FONTSIZE = 10 ++ ++#--------------------------------------------------------------------------- ++# configuration options related to the LaTeX output ++#--------------------------------------------------------------------------- ++ ++# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will ++# generate Latex output. ++ ++GENERATE_LATEX = NO ++ ++# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. ++# If a relative path is entered the value of OUTPUT_DIRECTORY will be ++# put in front of it. If left blank `latex' will be used as the default path. ++ ++LATEX_OUTPUT = latex ++ ++# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be ++# invoked. If left blank `latex' will be used as the default command name. ++ ++LATEX_CMD_NAME = latex ++ ++# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to ++# generate index for LaTeX. If left blank `makeindex' will be used as the ++# default command name. ++ ++MAKEINDEX_CMD_NAME = makeindex ++ ++# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact ++# LaTeX documents. This may be useful for small projects and may help to ++# save some trees in general. ++ ++COMPACT_LATEX = NO ++ ++# The PAPER_TYPE tag can be used to set the paper type that is used ++# by the printer. Possible values are: a4, a4wide, letter, legal and ++# executive. If left blank a4wide will be used. ++ ++PAPER_TYPE = a4wide ++ ++# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX ++# packages that should be included in the LaTeX output. ++ ++EXTRA_PACKAGES = ++ ++# The LATEX_HEADER tag can be used to specify a personal LaTeX header for ++# the generated latex document. The header should contain everything until ++# the first chapter. If it is left blank doxygen will generate a ++# standard header. Notice: only use this tag if you know what you are doing! ++ ++LATEX_HEADER = ++ ++# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated ++# is prepared for conversion to pdf (using ps2pdf). The pdf file will ++# contain links (just like the HTML output) instead of page references ++# This makes the output suitable for online browsing using a pdf viewer. ++ ++PDF_HYPERLINKS = YES ++ ++# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of ++# plain latex in the generated Makefile. Set this option to YES to get a ++# higher quality PDF documentation. ++ ++USE_PDFLATEX = YES ++ ++# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode. ++# command to the generated LaTeX files. This will instruct LaTeX to keep ++# running if errors occur, instead of asking the user for help. ++# This option is also used when generating formulas in HTML. ++ ++LATEX_BATCHMODE = NO ++ ++# If LATEX_HIDE_INDICES is set to YES then doxygen will not ++# include the index chapters (such as File Index, Compound Index, etc.) ++# in the output. ++ ++LATEX_HIDE_INDICES = NO ++ ++#--------------------------------------------------------------------------- ++# configuration options related to the RTF output ++#--------------------------------------------------------------------------- ++ ++# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output ++# The RTF output is optimized for Word 97 and may not look very pretty with ++# other RTF readers or editors. ++ ++GENERATE_RTF = NO ++ ++# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. ++# If a relative path is entered the value of OUTPUT_DIRECTORY will be ++# put in front of it. If left blank `rtf' will be used as the default path. ++ ++RTF_OUTPUT = rtf ++ ++# If the COMPACT_RTF tag is set to YES Doxygen generates more compact ++# RTF documents. This may be useful for small projects and may help to ++# save some trees in general. ++ ++COMPACT_RTF = NO ++ ++# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated ++# will contain hyperlink fields. The RTF file will ++# contain links (just like the HTML output) instead of page references. ++# This makes the output suitable for online browsing using WORD or other ++# programs which support those fields. ++# Note: wordpad (write) and others do not support links. ++ ++RTF_HYPERLINKS = NO ++ ++# Load stylesheet definitions from file. Syntax is similar to doxygen's ++# config file, i.e. a series of assignments. You only have to provide ++# replacements, missing definitions are set to their default value. ++ ++RTF_STYLESHEET_FILE = ++ ++# Set optional variables used in the generation of an rtf document. ++# Syntax is similar to doxygen's config file. ++ ++RTF_EXTENSIONS_FILE = ++ ++#--------------------------------------------------------------------------- ++# configuration options related to the man page output ++#--------------------------------------------------------------------------- ++ ++# If the GENERATE_MAN tag is set to YES (the default) Doxygen will ++# generate man pages ++ ++GENERATE_MAN = NO ++ ++# The MAN_OUTPUT tag is used to specify where the man pages will be put. ++# If a relative path is entered the value of OUTPUT_DIRECTORY will be ++# put in front of it. If left blank `man' will be used as the default path. ++ ++MAN_OUTPUT = man ++ ++# The MAN_EXTENSION tag determines the extension that is added to ++# the generated man pages (default is the subroutine's section .3) ++ ++MAN_EXTENSION = .3 ++ ++# If the MAN_LINKS tag is set to YES and Doxygen generates man output, ++# then it will generate one additional man file for each entity ++# documented in the real man page(s). These additional files ++# only source the real man page, but without them the man command ++# would be unable to find the correct page. The default is NO. ++ ++MAN_LINKS = NO ++ ++#--------------------------------------------------------------------------- ++# configuration options related to the XML output ++#--------------------------------------------------------------------------- ++ ++# If the GENERATE_XML tag is set to YES Doxygen will ++# generate an XML file that captures the structure of ++# the code including all documentation. ++ ++GENERATE_XML = NO ++ ++# The XML_OUTPUT tag is used to specify where the XML pages will be put. ++# If a relative path is entered the value of OUTPUT_DIRECTORY will be ++# put in front of it. If left blank `xml' will be used as the default path. ++ ++XML_OUTPUT = xml ++ ++# The XML_SCHEMA tag can be used to specify an XML schema, ++# which can be used by a validating XML parser to check the ++# syntax of the XML files. ++ ++XML_SCHEMA = ++ ++# The XML_DTD tag can be used to specify an XML DTD, ++# which can be used by a validating XML parser to check the ++# syntax of the XML files. ++ ++XML_DTD = ++ ++# If the XML_PROGRAMLISTING tag is set to YES Doxygen will ++# dump the program listings (including syntax highlighting ++# and cross-referencing information) to the XML output. Note that ++# enabling this will significantly increase the size of the XML output. ++ ++XML_PROGRAMLISTING = YES ++ ++#--------------------------------------------------------------------------- ++# configuration options for the AutoGen Definitions output ++#--------------------------------------------------------------------------- ++ ++# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will ++# generate an AutoGen Definitions (see autogen.sf.net) file ++# that captures the structure of the code including all ++# documentation. Note that this feature is still experimental ++# and incomplete at the moment. ++ ++GENERATE_AUTOGEN_DEF = NO ++ ++#--------------------------------------------------------------------------- ++# configuration options related to the Perl module output ++#--------------------------------------------------------------------------- ++ ++# If the GENERATE_PERLMOD tag is set to YES Doxygen will ++# generate a Perl module file that captures the structure of ++# the code including all documentation. Note that this ++# feature is still experimental and incomplete at the ++# moment. ++ ++GENERATE_PERLMOD = NO ++ ++# If the PERLMOD_LATEX tag is set to YES Doxygen will generate ++# the necessary Makefile rules, Perl scripts and LaTeX code to be able ++# to generate PDF and DVI output from the Perl module output. ++ ++PERLMOD_LATEX = NO ++ ++# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be ++# nicely formatted so it can be parsed by a human reader. This is useful ++# if you want to understand what is going on. On the other hand, if this ++# tag is set to NO the size of the Perl module output will be much smaller ++# and Perl will parse it just the same. ++ ++PERLMOD_PRETTY = YES ++ ++# The names of the make variables in the generated doxyrules.make file ++# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. ++# This is useful so different doxyrules.make files included by the same ++# Makefile don't overwrite each other's variables. ++ ++PERLMOD_MAKEVAR_PREFIX = ++ ++#--------------------------------------------------------------------------- ++# Configuration options related to the preprocessor ++#--------------------------------------------------------------------------- ++ ++# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will ++# evaluate all C-preprocessor directives found in the sources and include ++# files. ++ ++ENABLE_PREPROCESSING = YES ++ ++# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro ++# names in the source code. If set to NO (the default) only conditional ++# compilation will be performed. Macro expansion can be done in a controlled ++# way by setting EXPAND_ONLY_PREDEF to YES. ++ ++MACRO_EXPANSION = NO ++ ++# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES ++# then the macro expansion is limited to the macros specified with the ++# PREDEFINED and EXPAND_AS_DEFINED tags. ++ ++EXPAND_ONLY_PREDEF = NO ++ ++# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files ++# in the INCLUDE_PATH (see below) will be search if a #include is found. ++ ++SEARCH_INCLUDES = YES ++ ++# The INCLUDE_PATH tag can be used to specify one or more directories that ++# contain include files that are not input files but should be processed by ++# the preprocessor. ++ ++INCLUDE_PATH = ++ ++# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard ++# patterns (like *.h and *.hpp) to filter out the header-files in the ++# directories. If left blank, the patterns specified with FILE_PATTERNS will ++# be used. ++ ++INCLUDE_FILE_PATTERNS = ++ ++# The PREDEFINED tag can be used to specify one or more macro names that ++# are defined before the preprocessor is started (similar to the -D option of ++# gcc). The argument of the tag is a list of macros of the form: name ++# or name=definition (no spaces). If the definition and the = are ++# omitted =1 is assumed. To prevent a macro definition from being ++# undefined via #undef or recursively expanded use the := operator ++# instead of the = operator. ++ ++PREDEFINED = ++ ++# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then ++# this tag can be used to specify a list of macro names that should be expanded. ++# The macro definition that is found in the sources will be used. ++# Use the PREDEFINED tag if you want to use a different macro definition. ++ ++EXPAND_AS_DEFINED = ++ ++# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then ++# doxygen's preprocessor will remove all function-like macros that are alone ++# on a line, have an all uppercase name, and do not end with a semicolon. Such ++# function macros are typically used for boiler-plate code, and will confuse ++# the parser if not removed. ++ ++SKIP_FUNCTION_MACROS = YES ++ ++#--------------------------------------------------------------------------- ++# Configuration::additions related to external references ++#--------------------------------------------------------------------------- ++ ++# The TAGFILES option can be used to specify one or more tagfiles. ++# Optionally an initial location of the external documentation ++# can be added for each tagfile. The format of a tag file without ++# this location is as follows: ++# TAGFILES = file1 file2 ... ++# Adding location for the tag files is done as follows: ++# TAGFILES = file1=loc1 "file2 = loc2" ... ++# where "loc1" and "loc2" can be relative or absolute paths or ++# URLs. If a location is present for each tag, the installdox tool ++# does not have to be run to correct the links. ++# Note that each tag file must have a unique name ++# (where the name does NOT include the path) ++# If a tag file is not located in the directory in which doxygen ++# is run, you must also specify the path to the tagfile here. ++ ++TAGFILES = ++ ++# When a file name is specified after GENERATE_TAGFILE, doxygen will create ++# a tag file that is based on the input files it reads. ++ ++GENERATE_TAGFILE = ++ ++# If the ALLEXTERNALS tag is set to YES all external classes will be listed ++# in the class index. If set to NO only the inherited external classes ++# will be listed. ++ ++ALLEXTERNALS = NO ++ ++# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed ++# in the modules index. If set to NO, only the current project's groups will ++# be listed. ++ ++EXTERNAL_GROUPS = YES ++ ++# The PERL_PATH should be the absolute path and name of the perl script ++# interpreter (i.e. the result of `which perl'). ++ ++PERL_PATH = /usr/bin/perl ++ ++#--------------------------------------------------------------------------- ++# Configuration options related to the dot tool ++#--------------------------------------------------------------------------- ++ ++# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will ++# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base ++# or super classes. Setting the tag to NO turns the diagrams off. Note that ++# this option is superseded by the HAVE_DOT option below. This is only a ++# fallback. It is recommended to install and use dot, since it yields more ++# powerful graphs. ++ ++CLASS_DIAGRAMS = YES ++ ++# You can define message sequence charts within doxygen comments using the \msc ++# command. Doxygen will then run the mscgen tool (see ++# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the ++# documentation. The MSCGEN_PATH tag allows you to specify the directory where ++# the mscgen tool resides. If left empty the tool is assumed to be found in the ++# default search path. ++ ++MSCGEN_PATH = ++ ++# If set to YES, the inheritance and collaboration graphs will hide ++# inheritance and usage relations if the target is undocumented ++# or is not a class. ++ ++HIDE_UNDOC_RELATIONS = YES ++ ++# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is ++# available from the path. This tool is part of Graphviz, a graph visualization ++# toolkit from AT&T and Lucent Bell Labs. The other options in this section ++# have no effect if this option is set to NO (the default) ++ ++HAVE_DOT = NO ++ ++# By default doxygen will write a font called FreeSans.ttf to the output ++# directory and reference it in all dot files that doxygen generates. This ++# font does not include all possible unicode characters however, so when you need ++# these (or just want a differently looking font) you can specify the font name ++# using DOT_FONTNAME. You need need to make sure dot is able to find the font, ++# which can be done by putting it in a standard location or by setting the ++# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory ++# containing the font. ++ ++DOT_FONTNAME = FreeSans ++ ++# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. ++# The default size is 10pt. ++ ++DOT_FONTSIZE = 10 ++ ++# By default doxygen will tell dot to use the output directory to look for the ++# FreeSans.ttf font (which doxygen will put there itself). If you specify a ++# different font using DOT_FONTNAME you can set the path where dot ++# can find it using this tag. ++ ++DOT_FONTPATH = ++ ++# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen ++# will generate a graph for each documented class showing the direct and ++# indirect inheritance relations. Setting this tag to YES will force the ++# the CLASS_DIAGRAMS tag to NO. ++ ++CLASS_GRAPH = YES ++ ++# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen ++# will generate a graph for each documented class showing the direct and ++# indirect implementation dependencies (inheritance, containment, and ++# class references variables) of the class with other documented classes. ++ ++COLLABORATION_GRAPH = YES ++ ++# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen ++# will generate a graph for groups, showing the direct groups dependencies ++ ++GROUP_GRAPHS = YES ++ ++# If the UML_LOOK tag is set to YES doxygen will generate inheritance and ++# collaboration diagrams in a style similar to the OMG's Unified Modeling ++# Language. ++ ++UML_LOOK = NO ++ ++# If set to YES, the inheritance and collaboration graphs will show the ++# relations between templates and their instances. ++ ++TEMPLATE_RELATIONS = NO ++ ++# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT ++# tags are set to YES then doxygen will generate a graph for each documented ++# file showing the direct and indirect include dependencies of the file with ++# other documented files. ++ ++INCLUDE_GRAPH = YES ++ ++# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and ++# HAVE_DOT tags are set to YES then doxygen will generate a graph for each ++# documented header file showing the documented files that directly or ++# indirectly include this file. ++ ++INCLUDED_BY_GRAPH = YES ++ ++# If the CALL_GRAPH and HAVE_DOT options are set to YES then ++# doxygen will generate a call dependency graph for every global function ++# or class method. Note that enabling this option will significantly increase ++# the time of a run. So in most cases it will be better to enable call graphs ++# for selected functions only using the \callgraph command. ++ ++CALL_GRAPH = NO ++ ++# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then ++# doxygen will generate a caller dependency graph for every global function ++# or class method. Note that enabling this option will significantly increase ++# the time of a run. So in most cases it will be better to enable caller ++# graphs for selected functions only using the \callergraph command. ++ ++CALLER_GRAPH = NO ++ ++# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen ++# will graphical hierarchy of all classes instead of a textual one. ++ ++GRAPHICAL_HIERARCHY = YES ++ ++# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES ++# then doxygen will show the dependencies a directory has on other directories ++# in a graphical way. The dependency relations are determined by the #include ++# relations between the files in the directories. ++ ++DIRECTORY_GRAPH = YES ++ ++# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images ++# generated by dot. Possible values are png, jpg, or gif ++# If left blank png will be used. ++ ++DOT_IMAGE_FORMAT = png ++ ++# The tag DOT_PATH can be used to specify the path where the dot tool can be ++# found. If left blank, it is assumed the dot tool can be found in the path. ++ ++DOT_PATH = ++ ++# The DOTFILE_DIRS tag can be used to specify one or more directories that ++# contain dot files that are included in the documentation (see the ++# \dotfile command). ++ ++DOTFILE_DIRS = ++ ++# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of ++# nodes that will be shown in the graph. If the number of nodes in a graph ++# becomes larger than this value, doxygen will truncate the graph, which is ++# visualized by representing a node as a red box. Note that doxygen if the ++# number of direct children of the root node in a graph is already larger than ++# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note ++# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. ++ ++DOT_GRAPH_MAX_NODES = 50 ++ ++# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the ++# graphs generated by dot. A depth value of 3 means that only nodes reachable ++# from the root by following a path via at most 3 edges will be shown. Nodes ++# that lay further from the root node will be omitted. Note that setting this ++# option to 1 or 2 may greatly reduce the computation time needed for large ++# code bases. Also note that the size of a graph can be further restricted by ++# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. ++ ++MAX_DOT_GRAPH_DEPTH = 0 ++ ++# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent ++# background. This is disabled by default, because dot on Windows does not ++# seem to support this out of the box. Warning: Depending on the platform used, ++# enabling this option may lead to badly anti-aliased labels on the edges of ++# a graph (i.e. they become hard to read). ++ ++DOT_TRANSPARENT = NO ++ ++# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output ++# files in one run (i.e. multiple -o and -T options on the command line). This ++# makes dot run faster, but since only newer versions of dot (>1.8.10) ++# support this, this feature is disabled by default. ++ ++DOT_MULTI_TARGETS = NO ++ ++# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will ++# generate a legend page explaining the meaning of the various boxes and ++# arrows in the dot generated graphs. ++ ++GENERATE_LEGEND = YES ++ ++# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will ++# remove the intermediate dot files that are used to generate ++# the various graphs. ++ ++DOT_CLEANUP = YES ++ ++#--------------------------------------------------------------------------- ++# Configuration::additions related to the search engine ++#--------------------------------------------------------------------------- ++ ++# The SEARCHENGINE tag specifies whether or not a search engine should be ++# used. If set to NO the values of all tags below this one will be ignored. ++ ++SEARCHENGINE = NO +diff --git a/libiscsi/libiscsi.h b/libiscsi/libiscsi.h +new file mode 100644 +index 0000000..a7d05a5 +--- /dev/null ++++ b/libiscsi/libiscsi.h +@@ -0,0 +1,343 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#ifndef __LIBISCSI_H ++#define __LIBISCSI_H ++ ++#include <netdb.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++#if __GNUC__ >= 4 ++#define PUBLIC __attribute__ ((visibility("default"))) ++#else ++#define PUBLIC ++#endif ++ ++/** \brief Maximum length for iSCSI values. ++ * ++ * Maximum length for iSCSI values such as hostnames and parameter values. ++ */ ++#define LIBISCSI_VALUE_MAXLEN 256 ++ ++/** \brief supported authentication methods ++ * ++ * This enum lists all supported authentication methods. ++ */ ++enum libiscsi_auth_t { ++ libiscsi_auth_none /** No authentication */, ++ libiscsi_auth_chap /** CHAP authentication */, ++}; ++ ++/** \brief libiscsi context struct ++ * ++ * Note: even though libiscsi uses a context struct, the underlying open-iscsi ++ * code does not, so libiscsi is not thread safe, not even when using one ++ * context per thread! ++ */ ++struct libiscsi_context; ++ ++/** \brief iSCSI node record ++ * ++ * Struct holding data uniquely identifying an iSCSI node. ++ */ ++struct libiscsi_node { ++ char name[LIBISCSI_VALUE_MAXLEN] /** iSCSI iqn for the node. */; ++ int tpgt /** Portal group number. */; ++ /* Note open-iscsi has some code in place for multiple connections in one ++ node record and thus multiple address / port combi's, but this does not ++ get used anywhere, so we keep things simple and assume one connection */ ++ char address[NI_MAXHOST] /** Portal hostname or IP-address. */; ++ int port /** Portal port number. */; ++}; ++ ++/** \brief libiscsi CHAP authentication information struct ++ * ++ * Struct holding all data needed for CHAP login / authentication. Note that ++ * \e reverse_username may be a 0 length string in which case only forward ++ * authentication will be done. ++ */ ++struct libiscsi_chap_auth_info { ++ char username[LIBISCSI_VALUE_MAXLEN] /** Username */; ++ char password[LIBISCSI_VALUE_MAXLEN] /** Password */; ++ char reverse_username[LIBISCSI_VALUE_MAXLEN] /** Reverse Username */; ++ char reverse_password[LIBISCSI_VALUE_MAXLEN] /** Reverse Password */; ++}; ++ ++/** \brief generic libiscsi authentication information struct ++ * ++ * Struct holding authentication information for discovery and login. ++ */ ++struct libiscsi_auth_info { ++ enum libiscsi_auth_t method /** Authentication method to use */; ++ union { ++ struct libiscsi_chap_auth_info chap /** Chap specific info */; ++ } /** Union holding method depenend info */; ++}; ++ ++/** \brief Initalize libiscsi ++ * ++ * This function creates a libiscsi context and initalizes it. This context ++ * is need to use other libiscsi funtions. ++ * ++ * \return A pointer to the created context, or NULL in case of an error. ++ */ ++PUBLIC struct libiscsi_context *libiscsi_init(void); ++ ++/** \brief Cleanup libiscsi used resource ++ * ++ * This function cleanups any used resources and then destroys the passed ++ * context. After this the passed in context may no longer be used! ++ * ++ * \param context libiscsi context to operate on. ++ */ ++PUBLIC void libiscsi_cleanup(struct libiscsi_context *context); ++ ++/** \brief Discover iSCSI nodes using sendtargets and add them to the node db. ++ * ++ * This function connects to the given address and port and then tries to ++ * discover iSCSI nodes using the sendtargets protocol. Any found nodes are ++ * added to the local iSCSI node database and are returned in a dynamically ++ * allocated array. ++ * ++ * Note that the (optional) authentication info is for authenticating the ++ * discovery, and is not for the found nodes! If the connection(s) to the ++ * node(s) need authentication too, you can set the username / password for ++ * those (which can be different!) using the libiscsi_node_set_auth() function. ++ * ++ * \param context libiscsi context to operate on. ++ * \param address Hostname or IP-address to connect to. ++ * \param port Port to connect to, or 0 for the default port. ++ * \param auth_info Authentication information, or NULL. ++ * \param nr_found The number of found nodes will be returned ++ * through this pointer if not NULL. ++ * \param found_nodes The address of the dynamically allocated array ++ * of found nodes will be returned through this ++ * pointer if not NULL. The caller must free this ++ * array using free(). ++ * \return 0 on success, otherwise a standard error code ++ * (from errno.h). ++ */ ++PUBLIC int libiscsi_discover_sendtargets(struct libiscsi_context *context, ++ const char *address, int port, const struct libiscsi_auth_info *auth_info, ++ int *nr_found, struct libiscsi_node **found_nodes); ++ ++/** \brief Read iSCSI node info from firmware and add them to the node db. ++ * ++ * This function discovers iSCSI nodes using firmware (ppc or ibft). Any found ++ * nodes are added to the local iSCSI node database and are returned in a ++ * dynamically allocated array. ++ * ++ * Note that unlike sendtargets discovery, this function will also read ++ * authentication info and store that in the database too. ++ * ++ * Note this function currently is a stub which will always return -EINVAL ++ * (IOW it is not yet implemented) ++ * ++ * \param context libiscsi context to operate on. ++ * \param nr_found The number of found nodes will be returned ++ * through this pointer if not NULL. ++ * \param found_nodes The address of the dynamically allocated array ++ * of found nodes will be returned through this ++ * pointer if not NULL. The caller must free this ++ * array using free(). ++ * \return 0 on success, otherwise a standard error code ++ * (from errno.h). ++ */ ++PUBLIC int libiscsi_discover_firmware(struct libiscsi_context *context, ++ int *nr_found, struct libiscsi_node **found_nodes); ++ ++/** \brief Check validity of the given authentication info. ++ * ++ * This function checks the validity of the given authentication info. For ++ * example in case of CHAP, if the username and password are not empty. ++ * ++ * This function is mainly intended for use by language bindings. ++ * ++ * \param context libiscsi context to operate on. ++ * \param auth_info Authentication information to check. ++ * \return 0 on success, otherwise EINVAL. ++ */ ++PUBLIC int libiscsi_verify_auth_info(struct libiscsi_context *context, ++ const struct libiscsi_auth_info *auth_info); ++ ++/** \brief Set the authentication info for the given node. ++ * ++ * This function sets the authentication information for the node described by ++ * the given node record. This will overwrite any existing authentication ++ * information. ++ * ++ * This is the way to specify authentication information for nodes found ++ * through sendtargets discovery. ++ * ++ * Note: ++ * 1) This is a convience wrapper around libiscsi_node_set_parameter(), ++ * setting the node.session.auth.* parameters. ++ * 2) For nodes found through firmware discovery the authentication information ++ * has already been set from the firmware. ++ * 3) \e auth_info may be NULL in which case any existing authinfo will be ++ * cleared. ++ * ++ * \param context libiscsi context to operate on. ++ * \param node iSCSI node to set auth information of ++ * \param auth_info Authentication information, or NULL. ++ * \return 0 on success, otherwise a standard error code ++ * (from errno.h). ++ */ ++PUBLIC int libiscsi_node_set_auth(struct libiscsi_context *context, ++ const struct libiscsi_node *node, ++ const struct libiscsi_auth_info *auth_info); ++ ++/** \brief Get the authentication info for the given node. ++ * ++ * This function gets the authentication information for the node described by ++ * the given node record. ++ * ++ * \param context libiscsi context to operate on. ++ * \param node iSCSI node to set auth information of ++ * \param auth_info Pointer to a libiscsi_auth_info struct where ++ * the retreived information will be stored. ++ * \return 0 on success, otherwise a standard error code ++ * (from errno.h). ++ */ ++PUBLIC int libiscsi_node_get_auth(struct libiscsi_context *context, ++ const struct libiscsi_node *node, ++ struct libiscsi_auth_info *auth_info); ++ ++/** \brief Login to an iSCSI node. ++ * ++ * Login to the iSCSI node described by the given node record. ++ * ++ * \param context libiscsi context to operate on. ++ * \param node iSCSI node to login to. ++ * \return 0 on success, otherwise a standard error code ++ * (from errno.h). ++ */ ++PUBLIC int libiscsi_node_login(struct libiscsi_context *context, ++ const struct libiscsi_node *node); ++ ++/** \brief Logout of an iSCSI node. ++ * ++ * Logout of the iSCSI node described by the given node record. ++ * ++ * \param context libiscsi context to operate on. ++ * \param node iSCSI node to logout from. ++ * \return 0 on success, otherwise a standard error code ++ * (from errno.h). ++ */ ++PUBLIC int libiscsi_node_logout(struct libiscsi_context *context, ++ const struct libiscsi_node *node); ++ ++/** \brief Set an iSCSI parameter for the given node ++ * ++ * Set the given nodes iSCSI parameter named by \e parameter to value \e value. ++ * ++ * \param context libiscsi context to operate on. ++ * \param node iSCSI node to change a parameter from. ++ * \param parameter Name of the parameter to set. ++ * \param value Value to set the parameter too. ++ * \return 0 on success, otherwise a standard error code ++ * (from errno.h). ++ */ ++PUBLIC int libiscsi_node_set_parameter(struct libiscsi_context *context, ++ const struct libiscsi_node *node, ++ const char *parameter, const char *value); ++ ++/** \brief Get the value of an iSCSI parameter for the given node ++ * ++ * Get the value of the given nodes iSCSI parameter named by \e parameter. ++ * ++ * \param context libiscsi context to operate on. ++ * \param node iSCSI node to change a parameter from. ++ * \param parameter Name of the parameter to get. ++ * \param value The retreived value is stored here, this buffer must be ++ * atleast LIBISCSI_VALUE_MAXLEN bytes large. ++ * \return 0 on success, otherwise a standard error code ++ * (from errno.h). ++ */ ++PUBLIC int libiscsi_node_get_parameter(struct libiscsi_context *context, ++ const struct libiscsi_node *node, const char *parameter, char *value); ++ ++/** \brief Get human readable string describing the last libiscsi error. ++ * ++ * This function can be called to get a human readable error string when a ++ * libiscsi function has returned an error. This function uses a single buffer ++ * per context, thus the result is only valid as long as no other libiscsi ++ * calls are made on the same context after the failing function call. ++ * ++ * \param context libiscsi context to operate on. ++ * ++ * \return human readable string describing the last libiscsi error. ++ */ ++PUBLIC const char *libiscsi_get_error_string(struct libiscsi_context *context); ++ ++ ++/************************** Utility functions *******************************/ ++ ++/** \brief libiscsi network config struct ++ * ++ * libiscsi network config struct. ++ */ ++struct libiscsi_network_config { ++ int dhcp /** Using DHCP? (boolean). */; ++ char iface_name[LIBISCSI_VALUE_MAXLEN] /** Interface name. */; ++ char mac_address[LIBISCSI_VALUE_MAXLEN] /** MAC address. */; ++ char ip_address[LIBISCSI_VALUE_MAXLEN] /** IP address. */; ++ char netmask[LIBISCSI_VALUE_MAXLEN] /** Netmask. */; ++ char gateway[LIBISCSI_VALUE_MAXLEN] /** IP of Default gateway. */; ++ char primary_dns[LIBISCSI_VALUE_MAXLEN] /** IP of the Primary DNS. */; ++ char secondary_dns[LIBISCSI_VALUE_MAXLEN] /** IP of the Secondary DNS. */; ++}; ++ ++/** \brief Get network configuration information from iscsi firmware ++ * ++ * Function can be called to get the network configuration information ++ * (like dhcp, ip, netmask, default gateway, etc.) from the firmware of a ++ * network adapter with iscsi boot firmware. ++ * ++ * Note that not all fields of the returned struct are necessarilly filled, ++ * unset fields contain a 0 length string. ++ * ++ * \param config pointer to a libiscsi_network_config struct to fill. ++ * ++ * \return 0 on success, ENODEV when no iscsi firmware was found. ++ */ ++PUBLIC int libiscsi_get_firmware_network_config( ++ struct libiscsi_network_config *config); ++ ++/** \brief Get the initiator name (iqn) from the iscsi firmware ++ * ++ * Get the initiator name (iqn) from the iscsi firmware. ++ * ++ * \param initiatorname The initiator name is stored here, this buffer must be ++ * atleast LIBISCSI_VALUE_MAXLEN bytes large. ++ * \return 0 on success, ENODEV when no iscsi firmware was found. ++ */ ++PUBLIC int libiscsi_get_firmware_initiator_name(char *initiatorname); ++ ++#undef PUBLIC ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++#endif +diff --git a/libiscsi/pylibiscsi.c b/libiscsi/pylibiscsi.c +new file mode 100644 +index 0000000..454a26a +--- /dev/null ++++ b/libiscsi/pylibiscsi.c +@@ -0,0 +1,624 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <Python.h> ++#include "libiscsi.h" ++ ++static struct libiscsi_context *context = NULL; ++ ++/****************************** helpers ***********************************/ ++static int check_string(const char *string) ++{ ++ if (strlen(string) >= LIBISCSI_VALUE_MAXLEN) { ++ PyErr_SetString(PyExc_ValueError, "string too long"); ++ return -1; ++ } ++ return 0; ++} ++ ++/********************** PyIscsiChapAuthInfo ***************************/ ++ ++typedef struct { ++ PyObject_HEAD ++ ++ struct libiscsi_auth_info info; ++} PyIscsiChapAuthInfo; ++ ++static int PyIscsiChapAuthInfo_init(PyObject *self, PyObject *args, ++ PyObject *kwds) ++{ ++ int i; ++ PyIscsiChapAuthInfo *chap = (PyIscsiChapAuthInfo *)self; ++ char *kwlist[] = {"username", "password", "reverse_username", ++ "reverse_password", NULL}; ++ const char *string[4] = { NULL, NULL, NULL, NULL }; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, ++ "zz|zz:chapAuthInfo.__init__", ++ kwlist, &string[0], &string[1], ++ &string[2], &string[3])) ++ return -1; ++ ++ for (i = 0; i < 4; i++) ++ if (string[i] && check_string(string[i])) ++ return -1; ++ ++ memset (&chap->info, 0, sizeof(chap->info)); ++ chap->info.method = libiscsi_auth_chap; ++ if (string[0]) ++ strcpy(chap->info.chap.username, string[0]); ++ if (string[1]) ++ strcpy(chap->info.chap.password, string[1]); ++ if (string[2]) ++ strcpy(chap->info.chap.reverse_username, string[2]); ++ if (string[3]) ++ strcpy(chap->info.chap.reverse_password, string[3]); ++ ++ if (libiscsi_verify_auth_info(context, &chap->info)) { ++ PyErr_SetString(PyExc_ValueError, ++ libiscsi_get_error_string(context)); ++ return -1; ++ } ++ return 0; ++} ++ ++static PyObject *PyIscsiChapAuthInfo_get(PyObject *self, void *data) ++{ ++ PyIscsiChapAuthInfo *chap = (PyIscsiChapAuthInfo *)self; ++ const char *attr = (const char *)data; ++ ++ if (!strcmp(attr, "username")) { ++ return PyString_FromString(chap->info.chap.username); ++ } else if (!strcmp(attr, "password")) { ++ return PyString_FromString(chap->info.chap.password); ++ } else if (!strcmp(attr, "reverse_username")) { ++ return PyString_FromString(chap->info.chap.reverse_username); ++ } else if (!strcmp(attr, "reverse_password")) { ++ return PyString_FromString(chap->info.chap.reverse_password); ++ } ++ return NULL; ++} ++ ++static int PyIscsiChapAuthInfo_set(PyObject *self, PyObject *value, void *data) ++{ ++ PyIscsiChapAuthInfo *chap = (PyIscsiChapAuthInfo *)self; ++ const char *attr = (const char *)data; ++ const char *str; ++ ++ if (!PyArg_Parse(value, "s", &str) || check_string(str)) ++ return -1; ++ ++ if (!strcmp(attr, "username")) { ++ strcpy(chap->info.chap.username, str); ++ } else if (!strcmp(attr, "password")) { ++ strcpy(chap->info.chap.password, str); ++ } else if (!strcmp(attr, "reverse_username")) { ++ strcpy(chap->info.chap.reverse_username, str); ++ } else if (!strcmp(attr, "reverse_password")) { ++ strcpy(chap->info.chap.reverse_password, str); ++ } ++ ++ return 0; ++} ++ ++static int PyIscsiChapAuthInfo_compare(PyIscsiChapAuthInfo *self, ++ PyIscsiChapAuthInfo *other) ++{ ++ int r; ++ ++ r = strcmp(self->info.chap.username, other->info.chap.username); ++ if (r) ++ return r; ++ ++ r = strcmp(self->info.chap.password, other->info.chap.password); ++ if (r) ++ return r; ++ ++ r = strcmp(self->info.chap.reverse_username, ++ other->info.chap.reverse_username); ++ if (r) ++ return r; ++ ++ r = strcmp(self->info.chap.reverse_password, ++ other->info.chap.reverse_password); ++ return r; ++} ++ ++static PyObject *PyIscsiChapAuthInfo_str(PyObject *self) ++{ ++ PyIscsiChapAuthInfo *chap = (PyIscsiChapAuthInfo *)self; ++ char s[1024], reverse[512] = ""; ++ ++ if (chap->info.chap.reverse_username[0]) ++ snprintf(reverse, sizeof(reverse), ", %s:%s", ++ chap->info.chap.reverse_username, ++ chap->info.chap.reverse_password); ++ ++ snprintf(s, sizeof(s), "%s:%s%s", chap->info.chap.username, ++ chap->info.chap.password, reverse); ++ ++ return PyString_FromString(s); ++} ++ ++static struct PyGetSetDef PyIscsiChapAuthInfo_getseters[] = { ++ {"username", (getter)PyIscsiChapAuthInfo_get, ++ (setter)PyIscsiChapAuthInfo_set, ++ "username", "username"}, ++ {"password", (getter)PyIscsiChapAuthInfo_get, ++ (setter)PyIscsiChapAuthInfo_set, ++ "password", "password"}, ++ {"reverse_username", (getter)PyIscsiChapAuthInfo_get, ++ (setter)PyIscsiChapAuthInfo_set, ++ "reverse_username", "reverse_username"}, ++ {"reverse_password", (getter)PyIscsiChapAuthInfo_get, ++ (setter)PyIscsiChapAuthInfo_set, ++ "reverse_password", "reverse_password"}, ++ {NULL} ++}; ++ ++PyTypeObject PyIscsiChapAuthInfo_Type = { ++ PyObject_HEAD_INIT(NULL) ++ .tp_name = "libiscsi.chapAuthInfo", ++ .tp_basicsize = sizeof (PyIscsiChapAuthInfo), ++ .tp_getset = PyIscsiChapAuthInfo_getseters, ++ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | ++ Py_TPFLAGS_BASETYPE, ++ .tp_compare = (cmpfunc)PyIscsiChapAuthInfo_compare, ++ .tp_init = PyIscsiChapAuthInfo_init, ++ .tp_str = PyIscsiChapAuthInfo_str, ++ .tp_new = PyType_GenericNew, ++ .tp_doc = "iscsi chap authentication information.", ++}; ++ ++/***************************** PyIscsiNode ********************************/ ++ ++typedef struct { ++ PyObject_HEAD ++ ++ struct libiscsi_node node; ++} PyIscsiNode; ++ ++static int PyIscsiNode_init(PyObject *self, PyObject *args, PyObject *kwds) ++{ ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ char *kwlist[] = {"name", "tpgt", "address", "port", NULL}; ++ const char *name = NULL, *address = NULL; ++ int tpgt = -1, port = 3260; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|isi:node.__init__", ++ kwlist, &name, &tpgt, &address, &port)) ++ return -1; ++ if (address == NULL) { ++ PyErr_SetString(PyExc_ValueError, "address not set"); ++ return -1; ++ } ++ if (check_string(name) || check_string(address)) ++ return -1; ++ ++ strcpy(node->node.name, name); ++ node->node.tpgt = tpgt; ++ strcpy(node->node.address, address); ++ node->node.port = port; ++ ++ return 0; ++} ++ ++static PyObject *PyIscsiNode_get(PyObject *self, void *data) ++{ ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ const char *attr = (const char *)data; ++ ++ if (!strcmp(attr, "name")) { ++ return PyString_FromString(node->node.name); ++ } else if (!strcmp(attr, "tpgt")) { ++ return PyInt_FromLong(node->node.tpgt); ++ } else if (!strcmp(attr, "address")) { ++ return PyString_FromString(node->node.address); ++ } else if (!strcmp(attr, "port")) { ++ return PyInt_FromLong(node->node.port); ++ } ++ return NULL; ++} ++ ++static int PyIscsiNode_set(PyObject *self, PyObject *value, void *data) ++{ ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ const char *attr = (const char *)data; ++ const char *str; ++ int i; ++ ++ if (!strcmp(attr, "name")) { ++ if (!PyArg_Parse(value, "s", &str) || check_string(str)) ++ return -1; ++ strcpy(node->node.name, str); ++ } else if (!strcmp(attr, "tpgt")) { ++ if (!PyArg_Parse(value, "i", &i)) ++ return -1; ++ node->node.tpgt = i; ++ } else if (!strcmp(attr, "address")) { ++ if (!PyArg_Parse(value, "s", &str) || check_string(str)) ++ return -1; ++ strcpy(node->node.address, str); ++ } else if (!strcmp(attr, "port")) { ++ if (!PyArg_Parse(value, "i", &i)) ++ return -1; ++ node->node.port = i; ++ } ++ ++ return 0; ++} ++ ++static int PyIscsiNode_compare(PyIscsiNode *self, PyIscsiNode *other) ++{ ++ int res; ++ ++ res = strcmp(self->node.name, other->node.name); ++ if (res) ++ return res; ++ ++ if (self->node.tpgt < other->node.tpgt) ++ return -1; ++ if (self->node.tpgt > other->node.tpgt) ++ return -1; ++ ++ res = strcmp(self->node.address, other->node.address); ++ if (res) ++ return res; ++ ++ if (self->node.port < other->node.port) ++ return -1; ++ if (self->node.port > other->node.port) ++ return -1; ++ ++ return 0; ++} ++ ++static PyObject *PyIscsiNode_str(PyObject *self) ++{ ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ char s[1024], tpgt[16] = ""; ++ ++ if (node->node.tpgt != -1) ++ sprintf(tpgt, ",%d", node->node.tpgt); ++ ++ snprintf(s, sizeof(s), "%s:%d%s %s", node->node.address, ++ node->node.port, tpgt, node->node.name); ++ ++ return PyString_FromString(s); ++} ++ ++static PyObject *PyIscsiNode_login(PyObject *self) ++{ ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ ++ if (libiscsi_node_login(context, &node->node)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ Py_RETURN_NONE; ++} ++ ++static PyObject *PyIscsiNode_logout(PyObject *self) ++{ ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ ++ if (libiscsi_node_logout(context, &node->node)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ Py_RETURN_NONE; ++} ++ ++static PyObject *PyIscsiNode_setAuth(PyObject *self, PyObject *args, ++ PyObject *kwds) ++{ ++ char *kwlist[] = {"authinfo", NULL}; ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ PyObject *arg; ++ const struct libiscsi_auth_info *authinfo = NULL; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", kwlist, &arg)) ++ return NULL; ++ ++ if (arg == Py_None) { ++ authinfo = NULL; ++ } else if (PyObject_IsInstance(arg, (PyObject *) ++ &PyIscsiChapAuthInfo_Type)) { ++ PyIscsiChapAuthInfo *pyauthinfo = (PyIscsiChapAuthInfo *)arg; ++ authinfo = &pyauthinfo->info; ++ } else { ++ PyErr_SetString(PyExc_ValueError, "invalid authinfo type"); ++ return NULL; ++ } ++ ++ if (libiscsi_node_set_auth(context, &node->node, authinfo)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ Py_RETURN_NONE; ++} ++ ++static PyObject *PyIscsiNode_getAuth(PyObject *self) ++{ ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ PyIscsiChapAuthInfo *pyauthinfo; ++ struct libiscsi_auth_info authinfo; ++ ++ if (libiscsi_node_get_auth(context, &node->node, &authinfo)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ ++ switch (authinfo.method) { ++ case libiscsi_auth_chap: ++ pyauthinfo = PyObject_New(PyIscsiChapAuthInfo, ++ &PyIscsiChapAuthInfo_Type); ++ if (!pyauthinfo) ++ return NULL; ++ ++ pyauthinfo->info = authinfo; ++ ++ return (PyObject *)pyauthinfo; ++ ++ case libiscsi_auth_none: ++ default: ++ Py_RETURN_NONE; ++ } ++} ++ ++static PyObject *PyIscsiNode_setParameter(PyObject *self, PyObject *args, ++ PyObject *kwds) ++{ ++ char *kwlist[] = {"parameter", "value", NULL}; ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ const char *parameter, *value; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "ss", kwlist, ++ &parameter, &value)) ++ return NULL; ++ if (check_string(parameter) || check_string(value)) ++ return NULL; ++ ++ if (libiscsi_node_set_parameter(context, &node->node, parameter, ++ value)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ Py_RETURN_NONE; ++} ++ ++static PyObject *PyIscsiNode_getParameter(PyObject *self, PyObject *args, ++ PyObject *kwds) ++{ ++ char *kwlist[] = {"parameter", NULL}; ++ PyIscsiNode *node = (PyIscsiNode *)self; ++ const char *parameter; ++ char value[LIBISCSI_VALUE_MAXLEN]; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &parameter)) ++ return NULL; ++ if (check_string(parameter)) ++ return NULL; ++ ++ if (libiscsi_node_get_parameter(context, &node->node, parameter, ++ value)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ return Py_BuildValue("s", value); ++} ++ ++static struct PyGetSetDef PyIscsiNode_getseters[] = { ++ {"name", (getter)PyIscsiNode_get, (setter)PyIscsiNode_set, ++ "name", "name"}, ++ {"tpgt", (getter)PyIscsiNode_get, (setter)PyIscsiNode_set, ++ "tpgt", "tpgt"}, ++ {"address", (getter)PyIscsiNode_get, (setter)PyIscsiNode_set, ++ "address", "address"}, ++ {"port", (getter)PyIscsiNode_get, (setter)PyIscsiNode_set, ++ "port", "port"}, ++ {NULL} ++}; ++ ++static struct PyMethodDef PyIscsiNode_methods[] = { ++ {"login", (PyCFunction) PyIscsiNode_login, METH_NOARGS, ++ "Log in to the node"}, ++ {"logout", (PyCFunction) PyIscsiNode_logout, METH_NOARGS, ++ "Log out of the node"}, ++ {"setAuth", (PyCFunction) PyIscsiNode_setAuth, ++ METH_VARARGS|METH_KEYWORDS, ++ "Set authentication information"}, ++ {"getAuth", (PyCFunction) PyIscsiNode_getAuth, METH_NOARGS, ++ "Get authentication information"}, ++ {"setParameter", (PyCFunction) PyIscsiNode_setParameter, ++ METH_VARARGS|METH_KEYWORDS, ++ "Set an iscsi node parameter"}, ++ {"getParameter", (PyCFunction) PyIscsiNode_getParameter, ++ METH_VARARGS|METH_KEYWORDS, ++ "Get an iscsi node parameter"}, ++ {NULL} ++}; ++ ++PyTypeObject PyIscsiNode_Type = { ++ PyObject_HEAD_INIT(NULL) ++ .tp_name = "libiscsi.node", ++ .tp_basicsize = sizeof (PyIscsiNode), ++ .tp_getset = PyIscsiNode_getseters, ++ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_CHECKTYPES | ++ Py_TPFLAGS_BASETYPE, ++ .tp_methods = PyIscsiNode_methods, ++ .tp_compare = (cmpfunc)PyIscsiNode_compare, ++ .tp_init = PyIscsiNode_init, ++ .tp_str = PyIscsiNode_str, ++ .tp_new = PyType_GenericNew, ++ .tp_doc = "The iscsi node contains iscsi node information.", ++}; ++ ++/***************************************************************************/ ++ ++static PyObject *pylibiscsi_discover_sendtargets(PyObject *self, ++ PyObject *args, PyObject *kwds) ++{ ++ char *kwlist[] = {"address", "port", "authinfo", NULL}; ++ const char *address = NULL; ++ int i, nr_found, port = 3260; ++ PyObject *authinfo_arg = NULL; ++ const struct libiscsi_auth_info *authinfo = NULL; ++ struct libiscsi_node *found_nodes; ++ PyObject* found_node_list; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|iO", ++ kwlist, &address, &port, ++ &authinfo_arg)) ++ return NULL; ++ ++ if (authinfo_arg) { ++ if (PyObject_IsInstance(authinfo_arg, (PyObject *) ++ &PyIscsiChapAuthInfo_Type)) { ++ PyIscsiChapAuthInfo *pyauthinfo = ++ (PyIscsiChapAuthInfo *)authinfo_arg; ++ authinfo = &pyauthinfo->info; ++ } else if (authinfo_arg != Py_None) { ++ PyErr_SetString(PyExc_ValueError, ++ "invalid authinfo type"); ++ return NULL; ++ } ++ } ++ ++ if (libiscsi_discover_sendtargets(context, address, port, authinfo, ++ &nr_found, &found_nodes)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ ++ if (nr_found == 0) ++ Py_RETURN_NONE; ++ ++ found_node_list = PyList_New(nr_found); ++ if (!found_node_list) ++ return NULL; ++ ++ for(i = 0; i < nr_found; i++) { ++ PyIscsiNode *pynode; ++ ++ pynode = PyObject_New(PyIscsiNode, &PyIscsiNode_Type); ++ if (!pynode) { ++ /* This will deref already added nodes for us */ ++ Py_DECREF(found_node_list); ++ return NULL; ++ } ++ pynode->node = found_nodes[i]; ++ PyList_SET_ITEM(found_node_list, i, (PyObject *)pynode); ++ } ++ ++ return found_node_list; ++} ++ ++static PyObject *pylibiscsi_discover_firmware(PyObject *self) ++{ ++ int i, nr_found; ++ struct libiscsi_node *found_nodes; ++ PyObject* found_node_list; ++ ++ if (libiscsi_discover_firmware(context, &nr_found, &found_nodes)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ ++ if (nr_found == 0) ++ Py_RETURN_NONE; ++ ++ found_node_list = PyList_New(nr_found); ++ if (!found_node_list) ++ return NULL; ++ ++ for(i = 0; i < nr_found; i++) { ++ PyIscsiNode *pynode; ++ ++ pynode = PyObject_New(PyIscsiNode, &PyIscsiNode_Type); ++ if (!pynode) { ++ /* This will deref already added nodes for us */ ++ Py_DECREF(found_node_list); ++ return NULL; ++ } ++ pynode->node = found_nodes[i]; ++ PyList_SET_ITEM(found_node_list, i, (PyObject *)pynode); ++ } ++ ++ return found_node_list; ++} ++ ++static PyObject *pylibiscsi_get_firmware_initiator_name(PyObject *self) ++{ ++ char initiatorname[LIBISCSI_VALUE_MAXLEN]; ++ ++ if (libiscsi_get_firmware_initiator_name(initiatorname)) { ++ PyErr_SetString(PyExc_IOError, ++ libiscsi_get_error_string(context)); ++ return NULL; ++ } ++ ++ return PyString_FromString(initiatorname); ++} ++ ++static PyMethodDef pylibiscsi_functions[] = { ++ { "discover_sendtargets", ++ (PyCFunction)pylibiscsi_discover_sendtargets, ++ METH_VARARGS|METH_KEYWORDS, ++ "Do sendtargets discovery and return a list of found nodes)"}, ++ { "discover_firmware", ++ (PyCFunction)pylibiscsi_discover_firmware, METH_NOARGS, ++ "Do firmware discovery and return a list of found nodes)"}, ++ { "get_firmware_initiator_name", ++ (PyCFunction)pylibiscsi_get_firmware_initiator_name, ++ METH_NOARGS, ++ "Get initator name (iqn) from firmware"}, ++ {NULL, NULL} ++}; ++ ++PyMODINIT_FUNC initlibiscsi(void) ++{ ++ PyObject *m; ++ ++ if (!context) /* We may be called more then once */ ++ context = libiscsi_init(); ++ if (!context) ++ return; ++ ++ if (PyType_Ready(&PyIscsiChapAuthInfo_Type) < 0) ++ return; ++ ++ if (PyType_Ready(&PyIscsiNode_Type) < 0) ++ return; ++ ++ m = Py_InitModule("libiscsi", pylibiscsi_functions); ++ Py_INCREF(&PyIscsiChapAuthInfo_Type); ++ PyModule_AddObject(m, "chapAuthInfo", (PyObject *) &PyIscsiChapAuthInfo_Type); ++ Py_INCREF(&PyIscsiNode_Type); ++ PyModule_AddObject(m, "node", (PyObject *) &PyIscsiNode_Type); ++} +diff --git a/libiscsi/setup.py b/libiscsi/setup.py +new file mode 100644 +index 0000000..bb4329b +--- /dev/null ++++ b/libiscsi/setup.py +@@ -0,0 +1,9 @@ ++from distutils.core import setup, Extension ++ ++module1 = Extension('libiscsimodule', ++ sources = ['pylibiscsi.c'], ++ libraries = ['iscsi'], ++ library_dirs = ['.']) ++ ++setup (name = 'PyIscsi',version = '1.0', ++ description = 'libiscsi python bindings', ext_modules = [module1]) +diff --git a/libiscsi/tests/test_discovery_firmware.c b/libiscsi/tests/test_discovery_firmware.c +new file mode 100644 +index 0000000..76e852a +--- /dev/null ++++ b/libiscsi/tests/test_discovery_firmware.c +@@ -0,0 +1,53 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ struct libiscsi_node *found_nodes; ++ struct libiscsi_context *context; ++ int i, found, rc = 0; ++ ++ context = libiscsi_init(); ++ if (!context) { ++ fprintf(stderr, "Error initializing libiscsi\n"); ++ return 1; ++ } ++ ++ rc = libiscsi_discover_firmware(context, &found, &found_nodes); ++ if (rc) ++ fprintf(stderr, "Error discovering: %s\n", ++ libiscsi_get_error_string(context)); ++ ++ for (i = 0; i < found; i++) { ++ fprintf(stdout, "Found node: %s, tpgt: %d, portal: %s:%d\n", ++ found_nodes[i].name, found_nodes[i].tpgt, ++ found_nodes[i].address, found_nodes[i].port); ++ } ++ ++ libiscsi_cleanup(context); ++ free (found_nodes); ++ ++ return rc; ++} +diff --git a/libiscsi/tests/test_discovery_sendtargets.c b/libiscsi/tests/test_discovery_sendtargets.c +new file mode 100644 +index 0000000..1a3c12e +--- /dev/null ++++ b/libiscsi/tests/test_discovery_sendtargets.c +@@ -0,0 +1,60 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ struct libiscsi_node *found_nodes; ++ struct libiscsi_context *context; ++ struct libiscsi_auth_info auth_info; ++ int i, found, rc = 0; ++ ++ context = libiscsi_init(); ++ if (!context) { ++ fprintf(stderr, "Error initializing libiscsi\n"); ++ return 1; ++ } ++ ++ memset(&auth_info, 0, sizeof(auth_info)); ++ auth_info.method = libiscsi_auth_chap; ++ strcpy(auth_info.chap.username, "joe"); ++ strcpy(auth_info.chap.password, "secret"); ++ ++ rc = libiscsi_discover_sendtargets(context, "127.0.0.1", 3260, ++ &auth_info, &found, &found_nodes); ++ if (rc) ++ fprintf(stderr, "Error discovering: %s\n", ++ libiscsi_get_error_string(context)); ++ ++ for (i = 0; i < found; i++) { ++ fprintf(stdout, "Found node: %s, tpgt: %d, portal: %s:%d\n", ++ found_nodes[i].name, found_nodes[i].tpgt, ++ found_nodes[i].address, found_nodes[i].port); ++ } ++ ++ libiscsi_cleanup(context); ++ free (found_nodes); ++ ++ return rc; ++} +diff --git a/libiscsi/tests/test_get_auth.c b/libiscsi/tests/test_get_auth.c +new file mode 100644 +index 0000000..5e234da +--- /dev/null ++++ b/libiscsi/tests/test_get_auth.c +@@ -0,0 +1,70 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ struct libiscsi_node node; ++ struct libiscsi_context *context; ++ struct libiscsi_auth_info auth_info; ++ int rc = 0; ++ ++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s", ++ "iqn.2009-01.com.example:testdisk"); ++ node.tpgt = 1; ++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1"); ++ node.port = 3260; ++ ++ context = libiscsi_init(); ++ if (!context) { ++ fprintf(stderr, "Error initializing libiscsi\n"); ++ return 1; ++ } ++ ++ rc = libiscsi_node_get_auth(context, &node, &auth_info); ++ if (rc) { ++ fprintf(stderr, "Error setting authinfo: %s\n", ++ libiscsi_get_error_string(context)); ++ goto leave; ++ } ++ ++ switch (auth_info.method) { ++ case libiscsi_auth_none: ++ printf("Method: "None"\n"); ++ break; ++ case libiscsi_auth_chap: ++ printf("Method: "CHAP"\n"); ++ printf("User: "%s"\n", auth_info.chap.username); ++ printf("Pass: "%s"\n", auth_info.chap.password); ++ printf("RevUser: "%s"\n", ++ auth_info.chap.reverse_username); ++ printf("RevPass: "%s"\n", ++ auth_info.chap.reverse_password); ++ break; ++ } ++leave: ++ libiscsi_cleanup(context); ++ ++ return rc; ++} +diff --git a/libiscsi/tests/test_get_initiator_name.c b/libiscsi/tests/test_get_initiator_name.c +new file mode 100644 +index 0000000..997c053 +--- /dev/null ++++ b/libiscsi/tests/test_get_initiator_name.c +@@ -0,0 +1,38 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ char initiatorname[LIBISCSI_VALUE_MAXLEN]; ++ ++ if (libiscsi_get_firmware_initiator_name(initiatorname)) { ++ fprintf(stderr, "No iscsi boot firmware found\n"); ++ return 1; ++ } ++ ++ printf("iqn:\t%s\n", initiatorname); ++ ++ return 0; ++} +diff --git a/libiscsi/tests/test_get_network_config.c b/libiscsi/tests/test_get_network_config.c +new file mode 100644 +index 0000000..2dedd61 +--- /dev/null ++++ b/libiscsi/tests/test_get_network_config.c +@@ -0,0 +1,45 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ struct libiscsi_network_config config; ++ ++ if (libiscsi_get_firmware_network_config(&config)) { ++ fprintf(stderr, "No iscsi boot firmware found\n"); ++ return 1; ++ } ++ ++ printf("dhcp:\t%d\n", config.dhcp); ++ printf("iface:\t%s\n", config.iface_name); ++ printf("mac:\t%s\n", config.mac_address); ++ printf("ipaddr:\t%s\n", config.ip_address); ++ printf("mask:\t%s\n", config.netmask); ++ printf("gate:\t%s\n", config.gateway); ++ printf("dns1:\t%s\n", config.primary_dns); ++ printf("dns2:\t%s\n", config.secondary_dns); ++ ++ return 0; ++} +diff --git a/libiscsi/tests/test_login.c b/libiscsi/tests/test_login.c +new file mode 100644 +index 0000000..3eb70d6 +--- /dev/null ++++ b/libiscsi/tests/test_login.c +@@ -0,0 +1,52 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ struct libiscsi_node node; ++ struct libiscsi_context *context; ++ int rc = 0; ++ ++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s", ++ "iqn.2009-01.com.example:testdisk"); ++ node.tpgt = 1; ++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1"); ++ node.port = 3260; ++ ++ context = libiscsi_init(); ++ if (!context) { ++ fprintf(stderr, "Error initializing libiscsi\n"); ++ return 1; ++ } ++ ++ rc = libiscsi_node_login(context, &node); ++ if (rc) ++ fprintf(stderr, "Error logging in: %s\n", ++ libiscsi_get_error_string(context)); ++ ++ libiscsi_cleanup(context); ++ ++ return rc; ++} +diff --git a/libiscsi/tests/test_logout.c b/libiscsi/tests/test_logout.c +new file mode 100644 +index 0000000..b734dca +--- /dev/null ++++ b/libiscsi/tests/test_logout.c +@@ -0,0 +1,51 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ struct libiscsi_node node; ++ struct libiscsi_context *context; ++ int rc = 0; ++ ++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s", ++ "iqn.2009-01.com.example:testdisk"); ++ node.tpgt = 1; ++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1"); ++ node.port = 3260; ++ ++ context = libiscsi_init(); ++ if (!context) { ++ fprintf(stderr, "Error initializing libiscsi\n"); ++ return 1; ++ } ++ ++ rc = libiscsi_node_logout(context, &node); ++ if (rc) ++ fprintf(stderr, "Error logging out: %s\n", ++ libiscsi_get_error_string(context)); ++ ++ libiscsi_cleanup(context); ++ ++ return rc; ++} +diff --git a/libiscsi/tests/test_params.c b/libiscsi/tests/test_params.c +new file mode 100644 +index 0000000..d3223be +--- /dev/null ++++ b/libiscsi/tests/test_params.c +@@ -0,0 +1,103 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <errno.h> ++#include <string.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ struct libiscsi_node node; ++ struct libiscsi_context *context; ++ char orig_value[LIBISCSI_VALUE_MAXLEN], value[LIBISCSI_VALUE_MAXLEN]; ++ int rc = 0; ++ ++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s", ++ "iqn.2009-01.com.example:testdisk"); ++ node.tpgt = 1; ++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1"); ++ node.port = 3260; ++ ++ context = libiscsi_init(); ++ if (!context) { ++ fprintf(stderr, "Error initializing libiscsi\n"); ++ return 1; ++ } ++ ++ rc = libiscsi_node_get_parameter(context, &node, "node.startup", ++ orig_value); ++ if (rc) { ++ fprintf(stderr, "Error getting original value: %s\n", ++ libiscsi_get_error_string(context)); ++ goto leave; ++ } ++ ++ rc = libiscsi_node_set_parameter(context, &node, "node.startup", ++ "automatic"); ++ if (rc) { ++ fprintf(stderr, "Error setting node startup param: %s\n", ++ libiscsi_get_error_string(context)); ++ goto leave; ++ } ++ ++ rc = libiscsi_node_get_parameter(context, &node, "node.startup", ++ value); ++ if (rc) { ++ fprintf(stderr, "Error getting node startup param: %s\n", ++ libiscsi_get_error_string(context)); ++ goto leave; ++ } ++ ++ if (strcmp(value, "automatic")) { ++ fprintf(stderr, "Error set and get values do not match!\n"); ++ rc = EIO; ++ goto leave; ++ } ++ ++ rc = libiscsi_node_set_parameter(context, &node, "node.startup", ++ orig_value); ++ if (rc) { ++ fprintf(stderr, "Error setting original value: %s\n", ++ libiscsi_get_error_string(context)); ++ goto leave; ++ } ++ ++ rc = libiscsi_node_get_parameter(context, &node, "node.startup", ++ value); ++ if (rc) { ++ fprintf(stderr, "Error re-getting original value: %s\n", ++ libiscsi_get_error_string(context)); ++ goto leave; ++ } ++ ++ if (strcmp(value, orig_value)) { ++ fprintf(stderr, ++ "Error set and get original values do not match!\n"); ++ rc = EIO; ++ goto leave; ++ } ++ ++leave: ++ libiscsi_cleanup(context); ++ ++ return rc; ++} +diff --git a/libiscsi/tests/test_set_auth.c b/libiscsi/tests/test_set_auth.c +new file mode 100644 +index 0000000..a21f888 +--- /dev/null ++++ b/libiscsi/tests/test_set_auth.c +@@ -0,0 +1,58 @@ ++/* ++ * iSCSI Administration library ++ * ++ * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved. ++ * Copyright (C) 2008-2009 Hans de Goede hdegoede@redhat.com ++ * maintained by open-iscsi@googlegroups.com ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "libiscsi.h" ++ ++int main(void) ++{ ++ struct libiscsi_node node; ++ struct libiscsi_context *context; ++ struct libiscsi_auth_info auth_info; ++ int rc = 0; ++ ++ snprintf(node.name, LIBISCSI_VALUE_MAXLEN, "%s", ++ "iqn.2009-01.com.example:testdisk"); ++ node.tpgt = 1; ++ snprintf(node.address, NI_MAXHOST, "%s", "127.0.0.1"); ++ node.port = 3260; ++ ++ memset(&auth_info, 0, sizeof(auth_info)); ++ auth_info.method = libiscsi_auth_chap; ++ strcpy(auth_info.chap.username, "joe"); ++ strcpy(auth_info.chap.password, "secret"); ++ ++ context = libiscsi_init(); ++ if (!context) { ++ fprintf(stderr, "Error initializing libiscsi\n"); ++ return 1; ++ } ++ ++ rc = libiscsi_node_set_auth(context, &node, &auth_info); ++ if (rc) ++ fprintf(stderr, "Error setting authinfo: %s\n", ++ libiscsi_get_error_string(context)); ++ ++ libiscsi_cleanup(context); ++ ++ return rc; ++} +diff --git a/usr/discovery.c b/usr/discovery.c +index 381f825..2233de7 100644 +--- a/usr/discovery.c ++++ b/usr/discovery.c +@@ -36,6 +36,7 @@ + #include "types.h" + #include "iscsi_proto.h" + #include "initiator.h" ++#include "config.h" + #include "log.h" + #include "idbm.h" + #include "iscsi_settings.h" +diff --git a/usr/iscsi_ipc.h b/usr/iscsi_ipc.h +index 74ef948..713914f 100644 +--- a/usr/iscsi_ipc.h ++++ b/usr/iscsi_ipc.h +@@ -111,4 +111,6 @@ struct iscsi_ipc { + int (*recv_pdu_end) (struct iscsi_conn *conn); + }; + ++struct iscsi_ipc *ipc; ++ + #endif /* ISCSI_IPC_H */ diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch new file mode 100644 index 0000000..7f5acc5 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-disable-isns-for-lib.patch @@ -0,0 +1,74 @@ +diff --git a/libiscsi/Makefile b/libiscsi/Makefile +index 4aeb44f..a91d6b8 100644 +--- a/libiscsi/Makefile ++++ b/libiscsi/Makefile +@@ -3,7 +3,7 @@ + OSNAME=$(shell uname -s) + OPTFLAGS ?= -O2 -g + WARNFLAGS ?= -Wall -Wstrict-prototypes +-CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr -I../utils/open-isns \ ++CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \ + -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden + LIB = libiscsi.so.0 + TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware +@@ -43,11 +43,10 @@ fw-objs/%.o: ../utils/fwparam_ibft/%.c + $(CC) $(CFLAGS) -c $< -o $@ + + $(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o +- $(CC) $(CFLAGS) -L../utils/open-isns -lisns -shared -Wl,-soname,$(LIB) $^ -o $@ ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@ + ln -s -f $(LIB) libiscsi.so + + $(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB) +- $(CC) $(CFLAGS) -L../utils/open-isns -lisns -c $< -o $@ + + html: libiscsi.h libiscsi.doxy + doxygen libiscsi.doxy +diff --git a/usr/Makefile b/usr/Makefile +index 8e505bf..13a60f9 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -31,7 +31,7 @@ endif + OPTFLAGS ?= -O2 -g + WARNFLAGS ?= -Wall -Wstrict-prototypes + CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -I../include -I. -I../utils/open-isns \ +- -D$(OSNAME) $(IPC_CFLAGS) ++ -D$(OSNAME) $(IPC_CFLAGS) -DISNS_ENABLE + PROGRAMS = iscsid iscsiadm iscsistart + + # libc compat files +diff --git a/usr/discovery.c b/usr/discovery.c +index 2233de7..02c6f25 100644 +--- a/usr/discovery.c ++++ b/usr/discovery.c +@@ -45,9 +45,11 @@ + #include "iscsid_req.h" + #include "iscsi_util.h" + /* libisns includes */ ++#ifdef ISNS_ENABLE + #include "isns.h" + #include "paths.h" + #include "message.h" ++#endif + + #ifdef SLP_ENABLE + #include "iscsi-slp-discovery.h" +@@ -94,6 +96,7 @@ static int request_initiator_name(void) + return 0; + } + ++#ifdef ISNS_ENABLE + void discovery_isns_free_servername(void) + { + if (isns_config.ic_server_name) +@@ -367,6 +370,7 @@ retry: + discovery_isns_free_servername(); + return rc; + } ++#endif + + int discovery_fw(void *data, struct iface_rec *iface, + struct list_head *rec_list) +-- +1.6.6.1 + diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch new file mode 100644 index 0000000..763d784 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-dont-use-static.patch @@ -0,0 +1,12 @@ +diff -aup open-iscsi-2.0-872-rc1-bnx2i/usr/Makefile open-iscsi-2.0-872-rc1-bnx2i.work/usr/Makefile +--- open-iscsi-2.0-872-rc1-bnx2i/usr/Makefile 2010-06-18 18:04:51.000000000 -0500 ++++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/Makefile 2010-06-18 18:13:33.000000000 -0500 +@@ -60,7 +60,7 @@ iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_ + + iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) -static $^ -o $@ ++ $(CC) $(CFLAGS) $^ -o $@ + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) + diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch new file mode 100644 index 0000000..7b67f66 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-fix-lib-sysfs-init.patch @@ -0,0 +1,49 @@ +diff -aurp open-iscsi-2.0-872-rc1-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-rc1-bnx2i.work/libiscsi/libiscsi.c +--- open-iscsi-2.0-872-rc1-bnx2i/libiscsi/libiscsi.c 2010-05-18 17:57:59.000000000 -0500 ++++ open-iscsi-2.0-872-rc1-bnx2i.work/libiscsi/libiscsi.c 2010-05-18 17:58:43.000000000 -0500 +@@ -40,6 +40,9 @@ + + #define CHECK(a) { context->error_str[0] = 0; rc = a; if (rc) goto leave; } + ++/* UGLY, not thread safe :( */ ++static int sysfs_initialized = 0; ++ + struct libiscsi_context { + char error_str[256]; + /* For get_parameter_helper() */ +@@ -66,7 +69,10 @@ struct libiscsi_context *libiscsi_init(v + return NULL; + + log_init("libiscsi", 1024, libiscsi_log, context); +- sysfs_init(); ++ if (!sysfs_initialized) { ++ sysfs_init(); ++ sysfs_initialized = 1; ++ } + increase_max_files(); + if (idbm_init(NULL)) { + sysfs_cleanup(); +@@ -529,6 +535,11 @@ int libiscsi_get_firmware_network_config + { + struct boot_context fw_entry; + ++ if (!sysfs_initialized) { ++ sysfs_init(); ++ sysfs_initialized = 1; ++ } ++ + memset(config, 0, sizeof *config); + memset(&fw_entry, 0, sizeof fw_entry); + if (fw_get_entry(&fw_entry)) +@@ -551,6 +562,11 @@ int libiscsi_get_firmware_initiator_name + { + struct boot_context fw_entry; + ++ if (!sysfs_initialized) { ++ sysfs_init(); ++ sysfs_initialized = 1; ++ } ++ + memset(initiatorname, 0, LIBISCSI_VALUE_MAXLEN); + memset(&fw_entry, 0, sizeof fw_entry); + if (fw_get_entry(&fw_entry)) diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch new file mode 100644 index 0000000..b442ba0 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-only-root-use.patch @@ -0,0 +1,16 @@ +diff -up open-iscsi-2.0-870-rc1/usr/iscsiadm.c.error open-iscsi-2.0-870-rc1/usr/iscsiadm.c +--- open-iscsi-2.0-870-rc1/usr/iscsiadm.c.error 2008-09-30 10:20:15.000000000 +0200 ++++ open-iscsi-2.0-870-rc1/usr/iscsiadm.c 2008-09-30 10:20:15.000000000 +0200 +@@ -2141,6 +2141,12 @@ main(int argc, char **argv) + if (mode < 0) + usage(0); + ++ if (getuid()) { ++ log_error("Must be run as root."); ++ rc = -1; ++ goto free_ifaces; ++ } ++ + if (mode == MODE_FW) { + if ((rc = verify_mode_params(argc, argv, "ml", 0))) { + log_error("fw mode: option '-%c' is not " diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch new file mode 100644 index 0000000..cab3690 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-uip-mgmt.patch @@ -0,0 +1,385 @@ +diff --git a/usr/Makefile b/usr/Makefile +index e9d6bd1..8e505bf 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -42,7 +42,7 @@ ISCSI_LIB_SRCS = iscsi_util.o io.o auth.o login.o log.o md5.o sha1.o iface.o \ + iscsid_req.o $(SYSDEPS_SRCS) + # core initiator files + INITIATOR_SRCS = initiator.o scsi.o actor.o event_poll.o mgmt_ipc.o \ +- transport.o cxgb3i.o be2iscsi.o ++ transport.o cxgb3i.o be2iscsi.o uip_mgmt_ipc.o + # fw boot files + FW_BOOT_SRCS = $(wildcard ../utils/fwparam_ibft/*.o) + +diff --git a/usr/initiator.c b/usr/initiator.c +index 1c9d8b6..8f7a383 100644 +--- a/usr/initiator.c ++++ b/usr/initiator.c +@@ -45,6 +45,7 @@ + #include "iscsi_sysfs.h" + #include "iscsi_settings.h" + #include "iface.h" ++#include "host.h" + #include "sysdeps.h" + + #define ISCSI_CONN_ERR_REOPEN_DELAY 3 +@@ -743,6 +744,38 @@ static int iscsi_conn_connect(struct iscsi_conn *conn, queue_task_t *qtask) + return 0; + } + ++static int __set_net_config(struct iscsi_transport *t, ++ iscsi_session_t *session, ++ struct iface_rec *iface) ++{ ++ if (t->template->set_net_config) { ++ /* uip needs the netdev name */ ++ struct host_info hinfo; ++ int hostno, rc; ++ ++ /* this assumes that the netdev or hw address is going to be ++ set */ ++ hostno = iscsi_sysfs_get_host_no_from_hwinfo(iface, &rc); ++ if (rc) { ++ log_debug(4, "Couldn't get host no.\n"); ++ return rc; ++ } ++ ++ /* uip needs the netdev name */ ++ if (!strlen(iface->netdev)) { ++ memset(&hinfo, 0, sizeof(hinfo)); ++ hinfo.host_no = hostno; ++ iscsi_sysfs_get_hostinfo_by_host_no(&hinfo); ++ strcpy(iface->netdev, hinfo.iface.netdev); ++ } ++ ++ return t->template->set_net_config(t, iface, session); ++ } ++ ++ return 0; ++} ++ ++ + static void + __session_conn_reopen(iscsi_conn_t *conn, queue_task_t *qtask, int do_stop, + int redirected) +@@ -784,6 +817,11 @@ __session_conn_reopen(iscsi_conn_t *conn, queue_task_t *qtask, int do_stop, + if (!redirected) + session->reopen_cnt++; + ++ /* uIP will needs to be re-triggered on the connection re-open */ ++ if (__set_net_config(conn->session->t, conn->session, ++ &conn->session->nrec.iface) != 0) ++ goto queue_reopen; ++ + if (iscsi_conn_connect(conn, qtask)) { + delay = ISCSI_CONN_ERR_REOPEN_DELAY; + goto queue_reopen; +@@ -2130,6 +2168,10 @@ static int iface_set_param(struct iscsi_transport *t, struct iface_rec *iface, + return EINVAL; + } + ++ rc = __set_net_config(t, session, iface); ++ if (rc != 0) ++ return rc; ++ + rc = __iscsi_host_set_param(t, session->hostno, + ISCSI_HOST_PARAM_IPADDRESS, + iface->ipaddress, ISCSI_STRING); +diff --git a/usr/iscsid_req.c b/usr/iscsid_req.c +index 5280a0a..6eb8b1d 100644 +--- a/usr/iscsid_req.c ++++ b/usr/iscsid_req.c +@@ -22,6 +22,7 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> ++#include <fcntl.h> + #include <sys/un.h> + #include <sys/types.h> + #include <sys/socket.h> +@@ -31,6 +32,7 @@ + #include "mgmt_ipc.h" + #include "iscsi_util.h" + #include "config.h" ++#include "uip_mgmt_ipc.h" + + static void iscsid_startup(void) + { +@@ -51,7 +53,8 @@ static void iscsid_startup(void) + + #define MAXSLEEP 128 + +-static mgmt_ipc_err_e iscsid_connect(int *fd, int start_iscsid) ++static mgmt_ipc_err_e ipc_connect(int *fd, char *unix_sock_name, ++ int start_iscsid) + { + int nsec; + struct sockaddr_un addr; +@@ -64,8 +67,8 @@ static mgmt_ipc_err_e iscsid_connect(int *fd, int start_iscsid) + + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_LOCAL; +- memcpy((char *) &addr.sun_path + 1, ISCSIADM_NAMESPACE, +- strlen(ISCSIADM_NAMESPACE)); ++ memcpy((char *) &addr.sun_path + 1, unix_sock_name, ++ strlen(unix_sock_name)); + /* + * Trying to connect with exponential backoff + */ +@@ -93,6 +96,11 @@ static mgmt_ipc_err_e iscsid_connect(int *fd, int start_iscsid) + return MGMT_IPC_ERR_ISCSID_NOTCONN; + } + ++static mgmt_ipc_err_e iscsid_connect(int *fd, int start_iscsid) ++{ ++ return ipc_connect(fd, ISCSIADM_NAMESPACE, start_iscsid); ++} ++ + mgmt_ipc_err_e iscsid_request(int *fd, iscsiadm_req_t *req, int start_iscsid) + { + int err; +@@ -190,6 +198,72 @@ int iscsid_req_by_sid(iscsiadm_cmd_e cmd, int sid) + return iscsid_req_wait(cmd, fd); + } + ++static mgmt_ipc_err_e uip_connect(int *fd) ++{ ++ return ipc_connect(fd, ISCSID_UIP_NAMESPACE, 0); ++} ++ ++int uip_broadcast(void *buf, size_t buf_len) ++{ ++ int err; ++ int fd; ++ iscsid_uip_rsp_t rsp; ++ int flags; ++ int count; ++ ++ err = uip_connect(&fd); ++ if (err) { ++ log_warning("uIP daemon is not up"); ++ return err; ++ } ++ ++ /* Send the data to uIP */ ++ if ((err = write(fd, buf, buf_len)) != buf_len) { ++ log_error("got write error (%d/%d), daemon died?", ++ err, errno); ++ close(fd); ++ return -EIO; ++ } ++ ++ /* Set the socket to a non-blocking read, this way if there are ++ * problems waiting for uIP, iscsid can bailout early */ ++ flags = fcntl(fd, F_GETFL, 0); ++ if (flags == -1) ++ flags = 0; ++ err = fcntl(fd, F_SETFL, flags | O_NONBLOCK); ++ if(err != 0) { ++ log_error("could not set uip broadcast to non-blocking: %d", ++ errno); ++ close(fd); ++ return -EIO; ++ } ++ ++#define MAX_UIP_BROADCAST_READ_TRIES 3 ++ for(count = 0; count < MAX_UIP_BROADCAST_READ_TRIES; count++) { ++ /* Wait for the response */ ++ err = read(fd, &rsp, sizeof(rsp)); ++ if (err == sizeof(rsp)) { ++ log_debug(3, "Broadcasted to uIP with length: %ld\n", ++ buf_len); ++ break; ++ } else if((err == -1) && (errno == EAGAIN)) { ++ usleep(250000); ++ continue; ++ } else { ++ log_error("Could not read response (%d/%d), daemon died?", ++ err, errno); ++ break; ++ } ++ } ++ ++ if(count == MAX_UIP_BROADCAST_READ_TRIES) ++ log_error("Could not broadcast to uIP"); ++ ++ close(fd); ++ ++ return 0; ++} ++ + void iscsid_handle_error(mgmt_ipc_err_e err) + { + static char *err_msgs[] = { +diff --git a/usr/iscsid_req.h b/usr/iscsid_req.h +index 3bba2f4..e2cf1c3 100644 +--- a/usr/iscsid_req.h ++++ b/usr/iscsid_req.h +@@ -34,4 +34,6 @@ extern int iscsid_req_by_rec(int cmd, struct node_rec *rec); + extern int iscsid_req_by_sid_async(int cmd, int sid, int *fd); + extern int iscsid_req_by_sid(int cmd, int sid); + ++extern int uip_broadcast(void *buf, size_t buf_len); ++ + #endif +diff --git a/usr/transport.c b/usr/transport.c +index c0789bb..aa0395c 100644 +--- a/usr/transport.c ++++ b/usr/transport.c +@@ -25,6 +25,7 @@ + #include "log.h" + #include "iscsi_util.h" + #include "iscsi_sysfs.h" ++#include "uip_mgmt_ipc.h" + #include "cxgb3i.h" + #include "be2iscsi.h" + +@@ -58,6 +59,7 @@ struct iscsi_transport_template bnx2i = { + .ep_connect = ktransport_ep_connect, + .ep_poll = ktransport_ep_poll, + .ep_disconnect = ktransport_ep_disconnect, ++ .set_net_config = uip_broadcast_params, + }; + + struct iscsi_transport_template be2iscsi = { +diff --git a/usr/transport.h b/usr/transport.h +index 5ceedb3..2ec903c 100644 +--- a/usr/transport.h ++++ b/usr/transport.h +@@ -35,6 +35,9 @@ struct iscsi_transport_template { + int (*ep_poll) (struct iscsi_conn *conn, int timeout_ms); + void (*ep_disconnect) (struct iscsi_conn *conn); + void (*create_conn) (struct iscsi_conn *conn); ++ int (*set_net_config) (struct iscsi_transport *t, ++ struct iface_rec *iface, ++ struct iscsi_session *session); + }; + + /* represents data path provider */ +diff --git a/usr/uip_mgmt_ipc.c b/usr/uip_mgmt_ipc.c +new file mode 100644 +index 0000000..73b1632 +--- /dev/null ++++ b/usr/uip_mgmt_ipc.c +@@ -0,0 +1,41 @@ ++/* ++ * uIP iSCSI Daemon/Admin Management IPC ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++#include <string.h> ++ ++#include "log.h" ++#include "uip_mgmt_ipc.h" ++#include "iscsid_req.h" ++ ++int uip_broadcast_params(struct iscsi_transport *t, ++ struct iface_rec *iface, ++ struct iscsi_session *session) ++{ ++ struct iscsid_uip_broadcast broadcast; ++ ++ log_debug(3, "broadcasting to uip\n"); ++ ++ memset(&broadcast, 0, sizeof(broadcast)); ++ ++ broadcast.header.command = ISCSID_UIP_IPC_GET_IFACE; ++ broadcast.header.payload_len = sizeof(*iface); ++ ++ memcpy(&broadcast.u.iface_rec, iface, sizeof(*iface)); ++ ++ return uip_broadcast(&broadcast, ++ sizeof(iscsid_uip_broadcast_header_t) + ++ sizeof(*iface)); ++} +diff --git a/usr/uip_mgmt_ipc.h b/usr/uip_mgmt_ipc.h +new file mode 100644 +index 0000000..dd49c0b +--- /dev/null ++++ b/usr/uip_mgmt_ipc.h +@@ -0,0 +1,71 @@ ++/* ++ * uIP iSCSI Daemon/Admin Management IPC ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++#ifndef UIP_MGMT_IPC_H ++#define UIP_MGMT_IPC_H ++ ++#include "types.h" ++#include "iscsi_if.h" ++#include "config.h" ++#include "mgmt_ipc.h" ++ ++#include "initiator.h" ++#include "transport.h" ++ ++#define ISCSID_UIP_NAMESPACE "ISCSID_UIP_ABSTRACT_NAMESPACE" ++ ++typedef enum iscsid_uip_cmd { ++ ISCSID_UIP_IPC_UNKNOWN = 0, ++ ISCSID_UIP_IPC_GET_IFACE = 1, ++ ++ __ISCSID_UIP_IPC_MAX_COMMAND ++} iscsid_uip_cmd_e; ++ ++typedef struct iscsid_uip_broadcast_header { ++ iscsid_uip_cmd_e command; ++ uint32_t payload_len; ++} iscsid_uip_broadcast_header_t; ++ ++/* IPC Request */ ++typedef struct iscsid_uip_broadcast { ++ struct iscsid_uip_broadcast_header header; ++ ++ union { ++ /* messages */ ++ struct ipc_broadcast_iface_rec { ++ struct iface_rec rec; ++ } iface_rec; ++ } u; ++} iscsid_uip_broadcast_t; ++ ++typedef enum iscsid_uip_mgmt_ipc_err { ++ ISCSID_UIP_MGMT_IPC_OK = 0, ++ ISCISD_UIP_MGMT_IPC_ERR = 1, ++ ISCISD_UIP_MGMT_IPC_ERR_NOT_FOUND = 2, ++ ISCISD_UIP_MGMT_IPC_ERR_NOMEM = 3, ++} iscsid_uip_mgmt_ipc_err_e; ++ ++/* IPC Response */ ++typedef struct iscsid_uip_mgmt_rsp { ++ iscsid_uip_cmd_e command; ++ iscsid_uip_mgmt_ipc_err_e err; ++} iscsid_uip_rsp_t; ++ ++extern int uip_broadcast_params(struct iscsi_transport *t, ++ struct iface_rec *iface, ++ struct iscsi_session *session); ++ ++ ++#endif /* UIP_MGMT_IPC_H */ +-- +1.6.6.1 + diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch new file mode 100644 index 0000000..eb8003f --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-update-initscripts-and-docs.patch @@ -0,0 +1,114 @@ +diff -aurp open-iscsi-2.0-872-rc3-bnx2i/etc/iscsid.conf open-iscsi-2.0-872-rc3-bnx2i.diff/etc/iscsid.conf +--- open-iscsi-2.0-872-rc3-bnx2i/etc/iscsid.conf 2010-07-11 03:45:50.000000000 -0500 ++++ open-iscsi-2.0-872-rc3-bnx2i.diff/etc/iscsid.conf 2010-07-11 03:57:57.000000000 -0500 +@@ -17,10 +17,10 @@ + # maintainers. + # + # Default for Fedora and RHEL. (uncomment to activate). +-# iscsid.startup = /etc/rc.d/init.d/iscsid force-start ++iscsid.startup = /etc/rc.d/init.d/iscsid force-start + # + # Default for upstream open-iscsi scripts (uncomment to activate). +-iscsid.startup = /sbin/iscsid ++# iscsid.startup = /sbin/iscsid + + + ############################# +@@ -36,8 +36,8 @@ iscsid.startup = /sbin/iscsid + # To request that the iscsi initd scripts startup a session set to "automatic". + # node.startup = automatic + # +-# To manually startup the session set to "manual". The default is manual. +-node.startup = manual ++# To manually startup the session set to "manual". The default is automatic. ++node.startup = automatic + + + # ************* +@@ -255,29 +255,26 @@ node.conn[0].iscsi.MaxXmitDataSegmentLen + discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768 + + # To allow the targets to control the setting of the digest checking, +-# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines: ++# with the initiator requesting a preference of enabling the checking, uncomment ++# the following lines (Data digests are not supported.): + #node.conn[0].iscsi.HeaderDigest = CRC32C,None +-#node.conn[0].iscsi.DataDigest = CRC32C,None + # + # To allow the targets to control the setting of the digest checking, + # with the initiator requesting a preference of disabling the checking, +-# uncomment one or both of the following lines: ++# uncomment the following lines: + #node.conn[0].iscsi.HeaderDigest = None,CRC32C +-#node.conn[0].iscsi.DataDigest = None,CRC32C + # + # To enable CRC32C digest checking for the header and/or data part of +-# iSCSI PDUs, uncomment one or both of the following lines: ++# iSCSI PDUs, uncomment the following lines: + #node.conn[0].iscsi.HeaderDigest = CRC32C +-#node.conn[0].iscsi.DataDigest = CRC32C + # + # To disable digest checking for the header and/or data part of +-# iSCSI PDUs, uncomment one or both of the following lines: ++# iSCSI PDUs, uncomment the following lines: + #node.conn[0].iscsi.HeaderDigest = None +-#node.conn[0].iscsi.DataDigest = None + # + # The default is to never use DataDigests or HeaderDigests. + # +- ++node.conn[0].iscsi.HeaderDigest = None + + #************ + # Workarounds +diff -aurp open-iscsi-2.0-872-rc3-bnx2i/README open-iscsi-2.0-872-rc3-bnx2i.diff/README +--- open-iscsi-2.0-872-rc3-bnx2i/README 2010-07-11 03:45:50.000000000 -0500 ++++ open-iscsi-2.0-872-rc3-bnx2i.diff/README 2010-07-11 03:57:57.000000000 -0500 +@@ -74,11 +74,6 @@ the cache sync command will fail. + - iscsiadm's -P 3 option will not print out scsi devices. + - iscsid will not automatically online devices. + +-You need to enable "Cryptographic API" under "Cryptographic options" in the +-kernel config. And you must enable "CRC32c CRC algorithm" even if +-you do not use header or data digests. They are the kernel options, +-CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively. +- + By default the kernel source found at + /lib/modules/`uname -a`/build + will be used to compile the open-iscsi modules. To specify a different +@@ -907,7 +902,7 @@ Red Hat or Fedora: + ----------------- + To start open-iscsi in Red Hat/Fedora you can do: + +- service open-iscsi start ++ service iscsi start + + To get open-iscsi to automatically start at run time you may have to + run: +@@ -1115,6 +1110,8 @@ iscsid will only perform rediscovery whe + # linux-isns (SLES's iSNS server) where it sometimes does not send SCN + # events in the proper format, so they may not get handled. + ++To set the startup value, so that nodes are not logged into automatically ++use the value "manual". + + Example: + -------- +Only in open-iscsi-2.0-872-rc3-bnx2i.diff/: README.orig +diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c +--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c 2010-07-11 03:45:50.000000000 -0500 ++++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c 2010-07-11 03:57:57.000000000 -0500 +@@ -346,9 +346,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo + IDBM_SHOW, "None", "CRC32C", "CRC32C,None", + "None,CRC32C", num, 1); + sprintf(key, CONN_DATA_DIGEST, i); ++ ++#if 0 ++We do not support data digests + __recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW, + "None", "CRC32C", "CRC32C,None", + "None,CRC32C", num, 1); ++#endif + sprintf(key, CONN_IFMARKER, i); + __recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW, + "No", "Yes", num, 1); diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch new file mode 100644 index 0000000..c29c77b --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-red-hat-for-name.patch @@ -0,0 +1,12 @@ +diff -aurp open-iscsi-2.0-871.1.1-bnx2i/utils/iscsi-iname.c open-iscsi-2.0-871.1.1-bnx2i.work/utils/iscsi-iname.c +--- open-iscsi-2.0-871.1.1-bnx2i/utils/iscsi-iname.c 2010-01-15 02:24:02.000000000 -0600 ++++ open-iscsi-2.0-871.1.1-bnx2i.work/utils/iscsi-iname.c 2010-01-15 03:44:23.000000000 -0600 +@@ -73,7 +73,7 @@ main(int argc, char *argv[]) + exit(0); + } + } else { +- prefix = "iqn.2005-03.org.open-iscsi"; ++ prefix = "iqn.1994-05.com.redhat"; + } + + /* try to feed some entropy from the pool to MD5 in order to get diff --git a/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch new file mode 100644 index 0000000..6ed53e5 --- /dev/null +++ b/pkgs/core/iscsi-initiator-utils/patches/iscsi-initiator-utils-use-var-for-config.patch @@ -0,0 +1,234 @@ +diff -aurp open-iscsi-2.0-872-rc3-bnx2i/doc/iscsiadm.8 open-iscsi-2.0-872-rc3-bnx2i.diff/doc/iscsiadm.8 +--- open-iscsi-2.0-872-rc3-bnx2i/doc/iscsiadm.8 2010-07-11 03:45:50.000000000 -0500 ++++ open-iscsi-2.0-872-rc3-bnx2i.diff/doc/iscsiadm.8 2010-07-11 04:00:35.000000000 -0500 +@@ -51,7 +51,7 @@ display help text and exit + .TP + \fB-I\fR, \fB--interface\fI[iface]\fR + The interface argument specifies the iSCSI interface to use for the operation. +-iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware ++iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware + iSCSI (qla4xxx) the iface config must have the hardware address + (iface.hwaddress = port's MAC address) + and the driver/transport_name (iface.transport_name). The iface's name is +@@ -128,7 +128,7 @@ If no other options are specified: for \ + of their respective records are displayed; for \fIsession\fR, all active + sessions and connections are displayed; for \fIfw\fR, all boot firmware + values are displayed; for \fIhost\fR, all iSCSI hosts are displayed; and +-for \fIiface\fR, all ifaces setup in /etc/iscsi/ifaces are displayed. ++for \fIiface\fR, all ifaces setup in /var/lib/iscsi/ifaces are displayed. + + .TP + \fB-n\fR, \fB--name=\fIname\fR +@@ -336,10 +336,10 @@ The configuration file read by \fBiscsid + The file containing the iSCSI InitiatorName and InitiatorAlias read by + \fBiscsid\fR and \fBiscsiadm\fR on startup. + .TP +-/etc/iscsi/nodes/ ++/var/lib/iscsi/nodes/ + This directory contains the nodes with their targets. + .TP +-/etc/iscsi/send_targets ++/var/lib/iscsi/send_targets + This directory contains the portals. + + .SH "SEE ALSO" +Only in open-iscsi-2.0-872-rc3-bnx2i.diff/doc: iscsiadm.8.orig +diff -aurp open-iscsi-2.0-872-rc3-bnx2i/README open-iscsi-2.0-872-rc3-bnx2i.diff/README +--- open-iscsi-2.0-872-rc3-bnx2i/README 2010-07-11 03:58:50.000000000 -0500 ++++ open-iscsi-2.0-872-rc3-bnx2i.diff/README 2010-07-11 03:59:00.000000000 -0500 +@@ -144,10 +144,10 @@ available on all Linux installations. + + The database contains two tables: + +-- Discovery table (/etc/iscsi/send_targets); +-- Node table (/etc/iscsi/nodes). ++- Discovery table (/var/lib/iscsi/send_targets); ++- Node table (/var/lib/iscsi/nodes). + +-The regular place for iSCSI database files: /etc/iscsi/nodes ++The regular place for iSCSI database files: /var/lib/iscsi/nodes + + The iscsiadm utility is a command-line tool to manage (update, delete, + insert, query) the persistent database. +@@ -420,7 +420,7 @@ a scsi_host per HBA port). + To manage both types of initiator stacks, iscsiadm uses the interface (iface) + structure. For each HBA port or for software iscsi for each network + device (ethX) or NIC, that you wish to bind sessions to you must create +-a iface config /etc/iscsi/ifaces. ++a iface config /var/lib/iscsi/ifaces. + + Running: + +@@ -428,29 +428,29 @@ Running: + iface0 qla4xxx,00:c0:dd:08:63:e8,20.15.0.7,default,iqn.2005-06.com.redhat:madmax + iface1 qla4xxx,00:c0:dd:08:63:ea,20.15.0.9,default,iqn.2005-06.com.redhat:madmax + +-Will report iface configurations that are setup in /etc/iscsi/ifaces. ++Will report iface configurations that are setup in /var/lib/iscsi/ifaces. + The format is: + + iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname + + For software iscsi, you can create the iface configs by hand, but it is + reccomended that you use iscsiadm's iface mode. There is a iface.example in +-/etc/iscsi/ifaces which can be used as a template for the daring. ++/var/lib/iscsi/ifaces which can be used as a template for the daring. + + For each network object you wish to bind a session to you must create +-a seperate iface config in /etc/iscsi/ifaces and each iface config file ++a seperate iface config in /var/lib/iscsi/ifaces and each iface config file + must have a unique name which is less than or equal to 64 characters. + + Example: + + If you have NIC1 with MAC address 00:0F:1F:92:6B:BF and NIC2 with + MAC address 00:C0:DD:08:63:E7 and you wanted to do software iscsi over +-TCP/IP. Then in /etc/iscsi/ifaces/iface0 you would enter: ++TCP/IP. Then in /var/lib/iscsi/ifaces/iface0 you would enter: + + iface.transport_name = tcp + iface.hwaddress = 00:0F:1F:92:6B:BF + +-and in /etc/iscsi/ifaces/iface1 you would enter: ++and in /var/lib/iscsi/ifaces/iface1 you would enter: + + iface.transport_name = tcp + iface.hwaddress = 00:C0:DD:08:63:E7 +@@ -499,7 +499,7 @@ iser iser,<empty>,<empty>,<empty>,<empty + cxgb3i.00:07:43:05:97:07 cxgb3i,00:07:43:05:97:07,<empty>,<empty>,<empty> + + +-Will report iface configurations that are setup in /etc/iscsi/ifaces. ++Will report iface configurations that are setup in /var/lib/iscsi/ifaces. + The format is: + + iface_name transport_name,hwaddress,ipaddress,net_ifacename,initiatorname +@@ -515,7 +515,7 @@ default one in /etc/iscsi/initiatorname. + + + +-To display these values in a more friendly run: ++To display these values in a more friendly way run: + + iscsiadm -m iface -I cxgb3i.00:07:43:05:97:07 + # BEGIN RECORD 2.0-871 +@@ -553,7 +553,7 @@ need a seperate network connection to th + *This will be fixed in the next version of open-iscsi* + + For compatibility reasons, when you run iscsiadm to do discovery, it +-will check for interfaces in /etc/iscsi/iscsi/ifaces that are using ++will check for interfaces in /var/lib/iscsi/ifaces that are using + tcp for the iface.transport and it will bind the portals that are discovered + so that they will be logged in through those ifaces. This behavior can also + be overriden by passing in the interfaces you want to use. For the case +@@ -571,7 +571,7 @@ we do not bind a session to a iface, the + + iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1 + +-And if you did not define any interfaces in /etc/iscsi/ifaces and do ++And if you did not define any interfaces in /var/lib/iscsi/ifaces and do + not pass anything into iscsiadm, running iscsiadm will do the default + behavior, where we allow the network subsystem to decide which + device to use. +@@ -613,13 +613,13 @@ To now log into targets it is the same a + + ./iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover + +- This will search /etc/iscsi/send_targets for a record with the ++ This will search /var/lib/iscsi/send_targets for a record with the + ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it + will perform discovery using the settings stored in the record. + If a record does not exist, it will be created using the iscsid.conf + discovery settings. + +- For the ifaces, iscsiadm will first search /etc/iscsi/ifaces for ++ For the ifaces, iscsiadm will first search /var/lib/iscsi/ifaces for + interfaces using software iscsi. If any are found then nodes found + during discovery will be setup so that they can logged in through + those interfaces. To specify a specific iface, pass the +@@ -675,7 +675,7 @@ To now log into targets it is the same a + This command will perform discovery, but not manipulate the node DB. + + - SendTargets iSCSI Discovery with a specific interface. If you +- wish to only use a subset of the interfaces in /etc/iscsi/ifaces ++ wish to only use a subset of the interfaces in /var/lib/iscsi/ifaces + then you can pass them in during discovery: + + ./iscsiadm -m discoverydb -t sendtargets -p 192.168.1.1:3260 \ +@@ -982,8 +982,8 @@ where targetname is the name of the targ + and port of the portal. tpgt, is the portal group tag of + the portal, and is not used in iscsiadm commands except for static + record creation. And iface name is the name of the iscsi interface +-defined in /etc/iscsi/ifaces. If no interface was defined in +-/etc/iscsi/ifaces or passed in, the default behavior is used. ++defined in /var/lib/iscsi/ifaces. If no interface was defined in ++/var/lib/iscsi/ifaces or passed in, the default behavior is used. + Default here is iscsi_tcp/tcp to be used over which ever NIC the + network layer decides is best. + +@@ -1098,7 +1098,7 @@ If set, iscsid will perform discovery to + discovery.isns.discoveryd_poll_inval or + discovery.sendtargets.discoveryd_poll_inval seconds, + and it will log into any portals found from the discovery source using +-the ifaces in /etc/iscsi/ifaces. ++the ifaces in /var/lib/iscsi/ifaces. + + Note that for iSNS the poll_interval does not have to be set. If not set, + iscsid will only perform rediscovery when it gets a SCN from the server. +Only in open-iscsi-2.0-872-rc3-bnx2i.diff/: README.orig +diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c +--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.c 2010-07-11 03:58:50.000000000 -0500 ++++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.c 2010-07-11 03:59:00.000000000 -0500 +@@ -2235,9 +2235,9 @@ free_info: + int idbm_init(idbm_get_config_file_fn *fn) + { + /* make sure root db dir is there */ +- if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) { +- if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) { +- log_error("Could not make %s %d\n", ISCSI_CONFIG_ROOT, ++ if (access(ISCSIVAR, F_OK) != 0) { ++ if (mkdir(ISCSIVAR, 0660) != 0) { ++ log_error("Could not make %s %d\n", ISCSIVAR, + errno); + return errno; + } +Only in open-iscsi-2.0-872-rc3-bnx2i.diff/usr: idbm.c.orig +diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.h +--- open-iscsi-2.0-872-rc3-bnx2i/usr/idbm.h 2010-07-11 03:45:50.000000000 -0500 ++++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/idbm.h 2010-07-11 03:59:00.000000000 -0500 +@@ -27,12 +27,15 @@ + #include "initiator.h" + #include "config.h" + +-#define NODE_CONFIG_DIR ISCSI_CONFIG_ROOT"nodes" +-#define SLP_CONFIG_DIR ISCSI_CONFIG_ROOT"slp" +-#define ISNS_CONFIG_DIR ISCSI_CONFIG_ROOT"isns" +-#define STATIC_CONFIG_DIR ISCSI_CONFIG_ROOT"static" +-#define FW_CONFIG_DIR ISCSI_CONFIG_ROOT"fw" +-#define ST_CONFIG_DIR ISCSI_CONFIG_ROOT"send_targets" ++#define ISCSIVAR "/var/lib/iscsi/" ++ ++#define NODE_CONFIG_DIR ISCSIVAR"nodes" ++#define SLP_CONFIG_DIR ISCSIVAR"slp" ++#define ISNS_CONFIG_DIR ISCSIVAR"isns" ++#define STATIC_CONFIG_DIR ISCSIVAR"static" ++#define ST_CONFIG_DIR ISCSIVAR"send_targets" ++#define FW_CONFIG_DIR ISCSIVAR"fw" ++ + #define ST_CONFIG_NAME "st_config" + #define ISNS_CONFIG_NAME "isns_config" + +diff -aurp open-iscsi-2.0-872-rc3-bnx2i/usr/iface.h open-iscsi-2.0-872-rc3-bnx2i.diff/usr/iface.h +--- open-iscsi-2.0-872-rc3-bnx2i/usr/iface.h 2010-07-11 03:45:50.000000000 -0500 ++++ open-iscsi-2.0-872-rc3-bnx2i.diff/usr/iface.h 2010-07-11 03:59:00.000000000 -0500 +@@ -20,7 +20,9 @@ + #ifndef ISCSI_IFACE_H + #define ISCSI_IFACE_H + +-#define IFACE_CONFIG_DIR ISCSI_CONFIG_ROOT"ifaces" ++#include "idbm.h" ++ ++#define IFACE_CONFIG_DIR ISCSIVAR"ifaces" + + struct iface_rec; + struct list_head; diff --git a/pkgs/core/kbd/kbd.nm b/pkgs/core/kbd/kbd.nm index 4cad4fa..43bf61d 100644 --- a/pkgs/core/kbd/kbd.nm +++ b/pkgs/core/kbd/kbd.nm @@ -25,8 +25,9 @@ include $(PKGROOT)/Include

PKG_NAME = kbd -PKG_VER = 1.15.2 +PKG_VER = 1.15 PKG_REL = 0 +PKG_EPOCH = 1

PKG_MAINTAINER = PKG_GROUP = System/Base diff --git a/pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch b/pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch new file mode 100644 index 0000000..5e604b7 --- /dev/null +++ b/pkgs/core/kbd/patches/kbd-1.15-defkeymap.patch @@ -0,0 +1,12 @@ +diff -up kbd-1.15/src/paths.h.orig kbd-1.15/src/paths.h +--- kbd-1.15/src/paths.h.orig 2010-06-07 15:26:21.787315778 +0200 ++++ kbd-1.15/src/paths.h 2010-06-07 15:26:49.353336391 +0200 +@@ -19,7 +19,7 @@ + # define DEFMAP "sunkeymap.kmap" + # define KERNDIR "/usr/src/linux/drivers/sbus/char" + #else +-# define DEFMAP "defkeymap.kmap" ++# define DEFMAP "defkeymap.map" + # define KERNDIR "/usr/src/linux/drivers/char" + #endif + diff --git a/pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch b/pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch new file mode 100644 index 0000000..d18a8c8 --- /dev/null +++ b/pkgs/core/kbd/patches/kbd-1.15-keycodes-man.patch @@ -0,0 +1,52 @@ +diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1 +--- kbd-1.15/man/man1/showkey.1_old 2008-03-13 17:46:23.000000000 +0100 ++++ kbd-1.15/man/man1/showkey.1 2008-12-10 12:31:38.000000000 +0100 +@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar + to know the scan codes sent by various keys it is better to boot a + 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0 + that tells the 2.6 kernel to return the actual scan codes. ++ ++.SH NOTES ++The raw scan codes are available only on AT and PS/2 keyboards, ++and even then they are disabled unless the ++.B atkbd.softraw=0 ++kernel parameter is used. ++When the raw scan codes are not available, the kernel uses a fixed built-in ++table to produce scan codes from keycodes. Thus, ++.BR setkeycodes (8) ++can affect the output of ++.B showkey ++in scan code dump mode. ++ + .SH "SEE ALSO" + .BR loadkeys (1), + .BR dumpkeys (1), +diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8 +--- kbd-1.15/man/man8/setkeycodes.8_old 2008-12-10 12:31:56.000000000 +0100 ++++ kbd-1.15/man/man8/setkeycodes.8 2008-12-10 12:37:36.000000000 +0100 +@@ -41,6 +41,10 @@ to showkey(1), the command + will assign the keycode 112 to it, and then loadkeys(1) can be used + to define the function of this key. + ++USB keyboards have standardized keycodes and ++.B setkeycodes ++doesn't affect them at all. ++ + .SH "2.6 KERNELS" + In 2.6 kernels key codes lie in the range 1-255, instead of 1-127. + (It might be best to confine oneself to the range 1-239.) +@@ -54,6 +58,14 @@ None. + .SH BUGS + The keycodes of X have nothing to do with those of Linux. + Unusual keys can be made visible under Linux, but not under X. ++ ++.B setkeycodes ++affects only the "first" input device ++that has modifiable scancode-to-keycode mapping. ++If there is more than one such device, ++.B setkeycodes ++cannot change the mapping of other devices than the "first" one. ++ + .SH "SEE ALSO" + .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)" + diff --git a/pkgs/core/kbd/patches/kbd-1.15-po.patch b/pkgs/core/kbd/patches/kbd-1.15-po.patch new file mode 100644 index 0000000..0221f60 --- /dev/null +++ b/pkgs/core/kbd/patches/kbd-1.15-po.patch @@ -0,0 +1,31 @@ +diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in +--- kbd-1.15/po/Makefile.in_old 2008-10-23 21:03:59.000000000 +0200 ++++ kbd-1.15/po/Makefile.in 2008-12-09 15:35:58.000000000 +0100 +@@ -4,10 +4,10 @@ srcdir = @srcdir@ + + prefix = @prefix@ + datarootdir = @datarootdir@ +-datadir = @datadir@ +-localedir = $(DESTDIR)$(datadir)/locale +-gnulocaledir = $(DESTDIR)$(datadir)/locale +-gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po ++datadir = $(DESTDIR)@datadir@ ++localedir = $(DESTDIR)@localedir@ ++gnulocaledir = $(DESTDIR)@localedir@ ++gettextsrcdir = $(datadir)/gettext/po + + FOREIGN = @FOREIGN@ + HAVE_XGETTEXT = @HAVE_XGETTEXT@ +@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL) + COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + + # Enter here all .po files +-POFILES = cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \ ++POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po \ + ro.po ru.po sv.po tr.po + # the same but with .gmo +-GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \ ++GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \ + pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo + + CATALOGS = $(GMOFILES) diff --git a/pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch b/pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch new file mode 100644 index 0000000..eca867b --- /dev/null +++ b/pkgs/core/kbd/patches/kbd-1.15-quiet_doc.patch @@ -0,0 +1,34 @@ +diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in +--- kbd-1.15/man/man1/loadkeys.1.in_old 2008-10-23 21:03:59.000000000 +0200 ++++ kbd-1.15/man/man1/loadkeys.1.in 2009-03-05 13:11:08.000000000 +0100 +@@ -19,6 +19,8 @@ loadkeys - load keyboard translation ta + ] [ + .I -m --mktable + ] [ ++.I -q --quiet ++] [ + .I -s --clearstrings + ] [ + .I -v --verbose +@@ -148,6 +150,10 @@ command (and does not modify the current + .B loadkeys + prints its version number and a short usage message to the programs + standard error output and exits. ++.TP ++.B -q --quiet ++.B loadkeys ++suppresses all normal output. + .SH WARNING + Note that anyone having read access to + .B /dev/console +diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c +--- kbd-1.15/src/loadkeys.c_old 2008-10-23 21:03:59.000000000 +0200 ++++ kbd-1.15/src/loadkeys.c 2009-03-05 13:09:00.000000000 +0100 +@@ -1966,6 +1966,7 @@ usage(void) { + " -d --default load "%s"\n" + " -h --help display this help text\n" + " -m --mktable output a "defkeymap.c" to stdout\n" ++" -q --quiet suppress all normal output\n" + " -s --clearstrings clear kernel string table\n" + " -u --unicode implicit conversion to Unicode\n" + " -v --verbose report the changes\n"), PACKAGE_VERSION, DEFMAP); diff --git a/pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch b/pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch new file mode 100644 index 0000000..5e8350a --- /dev/null +++ b/pkgs/core/kbd/patches/kbd-1.15-resizecon-x86_64.patch @@ -0,0 +1,15 @@ +diff -up kbd-1.15/configure_old kbd-1.15/configure +--- kbd-1.15/configure_old 2009-01-08 15:11:04.000000000 +0100 ++++ kbd-1.15/configure 2009-01-08 15:11:45.000000000 +0100 +@@ -7637,8 +7637,9 @@ fi + + + case $host_cpu in +- i?86*) RESIZECONS_PROGS=yes ;; +- *) RESIZECONS_PROGS=no ;; ++ i?86*) RESIZECONS_PROGS=yes ;; ++ x86_64*) RESIZECONS_PROGS=yes ;; ++ *) RESIZECONS_PROGS=no ;; + esac + if test "$RESIZECONS_PROGS" = "yes"; then + RESIZECONS_PROGS_TRUE= diff --git a/pkgs/core/kbd/patches/kbd-1.15-sparc.patch b/pkgs/core/kbd/patches/kbd-1.15-sparc.patch new file mode 100644 index 0000000..a858a25 --- /dev/null +++ b/pkgs/core/kbd/patches/kbd-1.15-sparc.patch @@ -0,0 +1,97 @@ +diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8 +--- kbd-1.15/man/man8/kbdrate.8_old 2008-12-10 14:20:33.000000000 +0100 ++++ kbd-1.15/man/man8/kbdrate.8 2008-12-10 14:41:10.000000000 +0100 +@@ -22,7 +22,7 @@ Using + without any options will reset the repeat rate to 10.9 characters per second (cps) + and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems. + These are the IBM defaults. On SPARC-based systems it will reset the repeat rate +-to 5 cps and the delay to 200 ms. ++to 20 cps and the delay to 200 ms. + + .SH OPTIONS + .TP +@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa + .I /etc/rc.local + .br + .I /dev/port ++.br ++.I /dev/kbd +diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c +--- kbd-1.15/src/kbdrate.c_old 2008-12-10 14:00:25.000000000 +0100 ++++ kbd-1.15/src/kbdrate.c 2008-12-10 14:20:11.000000000 +0100 +@@ -77,7 +77,6 @@ beats rebuilding the kernel! + + #ifdef __sparc__ + #include <asm/param.h> +-#include <asm/kbio.h> + #endif + + #ifndef KDKBDREP +@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, + + static int + KDKBDREP_ioctl_ok(double rate, int delay, int silent) { ++#if defined(KDKBDREP) && !defined(__sparc__) + /* + * This ioctl is defined in <linux/kd.h> but is not + * implemented anywhere - must be in some m68k patches. ++ * We cannot blindly try unimplemented ioctls on sparc64 - ++ * the 32<->64bit transition layer does not like it. + * Since 2.4.9 also on i386. +- */ ++ */ ++ + struct my_kbd_repeat kbdrep_s; + + /* don't change, just test */ +@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay + rate, kbdrep_s.delay ); + + return 1; /* success! */ ++#else /* no KDKBDREP or __sparc__ */ ++ return 0; ++#endif /* KDKBDREP */ + } + + static int +@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) { + int + main( int argc, char **argv ) { + #ifdef __sparc__ +- double rate = 5.0; /* Default rate */ ++ double rate = 20.0; /* Default rate */ + int delay = 200; /* Default delay */ + #else + double rate = 10.9; /* Default rate */ +@@ -272,7 +278,9 @@ main( int argc, char **argv ) { + + + /* The ioport way */ ++ /* The ioport way - will crash on sparc */ + ++#ifndef __sparc__ + for (i = 0; i < RATE_COUNT; i++) + if (rate * 10 >= valid_rates[i]) { + value &= 0x60; +@@ -335,5 +343,7 @@ main( int argc, char **argv ) { + valid_rates[value & 0x1f] / 10.0, + valid_delays[ (value & 0x60) >> 5 ] ); + ++#endif ++ + return 0; + } +diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c +--- kbd-1.15/src/setleds.c_old 2008-12-10 14:00:02.000000000 +0100 ++++ kbd-1.15/src/setleds.c 2008-12-10 14:00:16.000000000 +0100 +@@ -14,10 +14,6 @@ + #include "nls.h" + #include "version.h" + +-#ifdef __sparc__ +-#include <asm/kbio.h> +-#endif +- + static void + usage(void) + { diff --git a/pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch b/pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch new file mode 100644 index 0000000..41827cc --- /dev/null +++ b/pkgs/core/kbd/patches/kbd-1.15-unicode_start.patch @@ -0,0 +1,21 @@ +diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start +--- kbd-1.15/src/unicode_start_old 2009-01-08 13:34:10.000000000 +0100 ++++ kbd-1.15/src/unicode_start 2009-01-08 14:02:12.000000000 +0100 +@@ -72,6 +72,9 @@ stty iutf8 + # have a Unicode map attached, or explicitly specified, e.g., + # by giving `def.uni' as a second argument. + ++DEFAULT_UNICODE_FONT=latarcyrheb-sun16 ++# Also drdos8x16 is a good candidate. ++ + case "$#" in + 2) + setfont "$1" -u "$2" +@@ -80,6 +83,7 @@ case "$#" in + setfont "$1" + ;; + 0) ++ setfont $DEFAULT_UNICODE_FONT + ;; + *) + echo "usage: unicode_start [font [unicode map]]" diff --git a/pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch b/pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch deleted file mode 100644 index 8fec171..0000000 --- a/pkgs/core/kbd/patches/kbd-1.15.1-backspace-1.patch +++ /dev/null @@ -1,250 +0,0 @@ -Submitted By: Matt Burgess -Date: 2008-12-06 -Initial Package Version: 1.15 -Upstream Status: Not submitted, possibly incomplete -Description: Makes Backspace and Delete keys consistent in all i386 keymaps. -Makes the Backspace key send character code 127, and Delete send a well known -escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386. - -Original patch for 1.12 by Alexander Patrakov. -Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map, -ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>. -Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>. - -diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map ---- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000 -@@ -43,7 +43,7 @@ - keycode 11 = three numbersign - keycode 12 = two at - keycode 13 = one exclam -- keycode 14 = BackSpace Delete -+ keycode 14 = Delete Delete - ! -------------------------------------------------------------------------- - ! Row 3 - ! -------------------------------------------------------------------------- -diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map ---- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000 -@@ -43,7 +43,7 @@ - keycode 11 = slash question - keycode 12 = bracketleft braceleft - keycode 13 = bracketright braceright -- keycode 14 = BackSpace Delete -+ keycode 14 = Delete Delete - ! -------------------------------------------------------------------------- - ! Row 3 - ! -------------------------------------------------------------------------- -diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map ---- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000 -@@ -51,7 +51,7 @@ - alt keycode 12 = Meta_minus - keycode 13 = minus underscore - alt keycode 13 = Meta_equal --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000 -@@ -205,7 +205,7 @@ - # edit this if you want the key above <Enter> to delete symbols above - # cursor, not before. - keycode 14 = \ -- BackSpace BackSpace BackSpace BackSpace \ -+ Delete Delete Delete Delete \ - Delete Delete Delete Delete \ - Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ - Meta_Delete Meta_Delete Meta_Delete Meta_Delete -@@ -506,7 +506,7 @@ - - # Edit this if you want strict VT100 emulation. - string F111 = "\033[3$" --keycode 111 = Delete F111 Delete F111 \ -+keycode 111 = Remove F111 Remove F111 \ - Remove Remove Remove Remove \ - Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ - Boot Boot Boot Boot -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000 -@@ -204,7 +204,7 @@ - # edit this if you want the key above <Enter> to delete symbols above - # cursor, not before. - keycode 14 = \ -- BackSpace BackSpace BackSpace BackSpace \ -+ Delete Delete Delete Delete \ - Delete Delete Delete Delete \ - Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ - Meta_Delete Meta_Delete Meta_Delete Meta_Delete -@@ -505,7 +505,7 @@ - - # Edit this if you want strict VT100 emulation. - string F111 = "\033[3$" --keycode 111 = Delete F111 Delete F111 \ -+keycode 111 = Remove F111 Remove F111 \ - Remove Remove Remove Remove \ - Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ - Boot Boot Boot Boot -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000 -@@ -3,7 +3,7 @@ - # Send comments to Kjetil T. Homme kjetilho@ifi.uio.no - include "linux-with-alt-and-altgr" - plain keycode 83 = KP_Comma -- plain keycode 111 = Delete # "Remove" originally, weird... -+ plain keycode 111 = Remove - strings as usual - - keycode 1 = Escape -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000 -@@ -143,8 +143,8 @@ - - # The keycode "0xFF" is too dangerous for many programs (including emacs). - # So let it be bracket instead of Hard Sign. --# altgr keycode 27 = +0xDF --# altgr shift keycode 27 = +0xFF -+altgr keycode 27 = +0xDF -+altgr shift keycode 27 = +0xFF - control keycode 27 = Control_bracketright - altgr control keycode 27 = Control_bracketright - alt keycode 27 = Meta_bracketright -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000 -@@ -46,7 +46,7 @@ - alt keycode 12 = Meta_minus - keycode 13 = equal plus equal plus - alt keycode 13 = Meta_equal -- keycode 14 = BackSpace BackSpace BackSpace BackSpace -+ keycode 14 = Delete Delete Delete Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab Tab Tab Tab - alt keycode 15 = Meta_Tab -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000 -@@ -39,7 +39,7 @@ - alt keycode 12 = Meta_minus - keycode 13 = equal plus equal plus - alt keycode 13 = Meta_equal -- keycode 14 = BackSpace -+ keycode 14 = Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab - alt keycode 15 = Meta_Tab -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000 -@@ -89,8 +89,8 @@ - altgr alt keycode 13 = Meta_equal - shift alt keycode 13 = Meta_plus - altgr shift alt keycode 13 = Meta_plus -- keycode 14 = BackSpace BackSpace BackSpace BackSpace --# keycode 14 = Delete Delete Delete Delete -+# keycode 14 = BackSpace BackSpace BackSpace BackSpace -+ keycode 14 = Delete Delete Delete Delete - alt keycode 14 = Meta_Delete - altgr alt keycode 14 = Meta_Delete - keycode 15 = Tab Tab Tab Tab -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000 -@@ -42,7 +42,7 @@ - alt keycode 12 = Meta_minus - keycode 13 = equal plus equal plus - alt keycode 13 = Meta_equal -- keycode 14 = BackSpace BackSpace BackSpace BackSpace -+ keycode 14 = Delete Delete Delete Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab Tab Tab Tab - alt keycode 15 = Meta_Tab -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000 -@@ -345,7 +345,7 @@ - keycode 109 = Next Scroll_Forward - keycode 110 = Insert - -- keycode 111 = Delete # "Remove" originally, weird... -+ keycode 111 = Remove - control alt keycode 111 = Boot - control altgr keycode 111 = Boot - -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000 -@@ -374,6 +374,6 @@ - keycode 109 = Next Scroll_Forward - keycode 110 = Insert - -- keycode 111 = Delete # "Remove" originally, weird... -+ keycode 111 = Remove - control alt keycode 111 = Boot - control altgr keycode 111 = Boot -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000 -@@ -49,7 +49,7 @@ - alt keycode 12 = Meta_minus - keycode 13 = minus underscore - alt keycode 13 = Meta_equal --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - alt keycode 14 = Meta_Delete - keycode 15 = Tab Meta_Tab - alt keycode 15 = Meta_Tab -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000 -@@ -249,7 +249,7 @@ - shift ctrll ctrlr keycode 13 = plus - alt ctrll ctrlr keycode 13 = Meta_equal - shift alt ctrll ctrlr keycode 13 = Meta_plus --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete - ctrlr keycode 14 = BackSpace -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000 -@@ -250,7 +250,7 @@ - shift ctrll ctrlr keycode 13 = plus - alt ctrll ctrlr keycode 13 = Meta_equal - shift alt ctrll ctrlr keycode 13 = Meta_plus --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete - ctrlr keycode 14 = BackSpace -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000 -@@ -260,7 +260,7 @@ - shift ctrll ctrlr keycode 13 = plus - alt ctrll ctrlr keycode 13 = Meta_equal - shift alt ctrll ctrlr keycode 13 = Meta_plus --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete - ctrlr keycode 14 = BackSpace -diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map ---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100 -+++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000 -@@ -260,7 +260,7 @@ - shift ctrll ctrlr keycode 13 = plus - alt ctrll ctrlr keycode 13 = Meta_equal - shift alt ctrll ctrlr keycode 13 = Meta_plus --keycode 14 = BackSpace Delete -+keycode 14 = Delete Delete - control keycode 14 = BackSpace - alt keycode 14 = Meta_Delete - ctrlr keycode 14 = BackSpace diff --git a/pkgs/core/nspr/nspr-config-vars.in b/pkgs/core/nspr/nspr-config-vars.in new file mode 100644 index 0000000..ebf0aa4 --- /dev/null +++ b/pkgs/core/nspr/nspr-config-vars.in @@ -0,0 +1,2 @@ +ldflags=@LDFLAGS@ +os_libs=@OS_LIBS@ diff --git a/pkgs/core/nspr/nspr.nm b/pkgs/core/nspr/nspr.nm new file mode 100644 index 0000000..4232a98 --- /dev/null +++ b/pkgs/core/nspr/nspr.nm @@ -0,0 +1,107 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = nspr +PKG_VER = 4.8.6 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.mozilla.org/projects/nspr/ +PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+ +PKG_SUMMARY = Netscape Portable Runtime. + +define PKG_DESCRIPTION + NSPR provides platform independence for non-GUI operating system \ + facilities. These facilities include threads, thread synchronization, \ + normal file and network I/O, interval timing and calendar time, basic \ + memory management (malloc and free) and shared library linking. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +# Original nspr-config is not suitable for our distribution, +# because on different platforms it contains different dynamic content. +# Therefore we produce an adjusted copy of nspr-config that will be +# identical on all platforms. +# However, we need to use original nspr-config to produce some variables +# that go into nspr.pc for pkg-config. + +define STAGE_PREPARE + cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL) + + cp -vf $(DIR_APP)/mozilla/nsprpub/config/nspr-config.in \ + $(DIR_APP)/mozilla/nsprpub/config/nspr-config-pc.in + cp -vf $(DIR_SOURCE)/nspr-config-vars.in \ + $(DIR_APP)/mozilla/nsprpub/config/ + + $(DO_PATCHES) +endef + +define STAGE_BUILD + cd $(DIR_APP) && $(DIR_APP)/mozilla/nsprpub/configure \ + $(CONFIGURE_OPTIONS) \ + --libdir=/lib \ + --includedir=/usr/include/nspr4 \ + --enable-optimize="$(CFLAGS)" \ + --disable-debug + + cd $(DIR_APP) && make +endef + +define STAGE_INSTALL_CMDS + -mkdir -pv $(BUILDROOT)/usr/{bin,lib} + -mkdir -pv $(BUILDROOT)/lib + -mkdir -pv $(BUILDROOT)/usr/lib/pkgconfig + + cp -vf $(DIR_APP)/config/nspr-config-pc \ + $(BUILDROOT)/usr/bin/nspr-config + + sed \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr,g" \ + -e "s,%includedir%,/usr/include/nspr4,g" \ + -e "s,%NSPR_VERSION%,$(PKG_VER),g" \ + -e "s,%FULL_NSPR_LIBS%,-L/usr/lib -lnspr4 -lplc4 -lplds4 -ldl -lpthread,g" \ + -e "s,%FULL_NSPR_CFLAGS%,-I/usr/include/nspr4,g" \ + < $(DIR_SOURCE)/nspr.pc.in \ + > $(BUILDROOT)/usr/lib/pkgconfig/nspr.pc + + #mv -v $(BUILDROOT)/usr/lib/lib{nspr,plc.plds}4.so $(BUILDROOT)/lib/ + ln -svf ../../lib/libnspr4.so $(BUILDROOT)/usr/lib/libnspr4.so + ln -svf ../../lib/libplc4.so $(BUILDROOT)/usr/lib/libplc4.so + ln -svf ../../lib/libplds4.so $(BUILDROOT)/usr/lib/libplds4.so + + # Remove unneeded stuff + rm -rfv \ + $(BUILDROOT)/usr/bin/compile-et.pl \ + $(BUILDROOT)/usr/bin/prerr.properties \ + $(BUILDROOT)/usr/share/aclocal/nspr.m4 \ + $(BUILDROOT)/usr/include/nspr4/md +endef diff --git a/pkgs/core/nspr/nspr.pc.in b/pkgs/core/nspr/nspr.pc.in new file mode 100644 index 0000000..1d8f4a0 --- /dev/null +++ b/pkgs/core/nspr/nspr.pc.in @@ -0,0 +1,10 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSPR +Description: The Netscape Portable Runtime +Version: %NSPR_VERSION% +Libs: %FULL_NSPR_LIBS% +Cflags: %FULL_NSPR_CFLAGS% diff --git a/pkgs/core/nspr/patches/nspr-config-pc.patch b/pkgs/core/nspr/patches/nspr-config-pc.patch new file mode 100644 index 0000000..24b1123 --- /dev/null +++ b/pkgs/core/nspr/patches/nspr-config-pc.patch @@ -0,0 +1,48 @@ +--- a/bmozilla/nsprpub/config/nspr-config-pc.in.x123 2005-05-11 02:53:41.000000000 +0200 ++++ b/mozilla/nsprpub/config/nspr-config-pc.in 2006-05-24 20:52:12.000000000 +0200 +@@ -98,7 +98,7 @@ + includedir=@includedir@ + fi + if test -z "$libdir"; then +- libdir=@libdir@ ++ libdir=`pkg-config --variable=libdir nspr` + fi + + if test "$echo_prefix" = "yes"; then +@@ -132,12 +132,12 @@ + if test -n "$lib_nspr"; then + libdirs="$libdirs -lnspr${major_version}" + fi +- os_ldflags="@LDFLAGS@" ++ os_ldflags=`pkg-config --variable=ldflags nspr` + for i in $os_ldflags ; do + if echo $i | grep ^-L >/dev/null; then + libdirs="$libdirs $i" + fi + done +- echo $libdirs @OS_LIBS@ ++ echo $libdirs `pkg-config --variable=os_libs nspr` + fi + +--- a/mozilla/nsprpub/configure.in.x123 2006-05-24 20:52:12.000000000 +0200 ++++ b/mozilla/nsprpub/configure.in 2006-05-24 20:53:53.000000000 +0200 +@@ -2667,6 +2667,8 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr-config-pc ++config/nspr-config-vars + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +--- a/mozilla/nsprpub/configure.x123 2006-05-24 20:52:12.000000000 +0200 ++++ b/mozilla/nsprpub/configure 2006-05-24 20:54:05.000000000 +0200 +@@ -5899,6 +5899,8 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr-config-pc ++config/nspr-config-vars + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile diff --git a/pkgs/core/nss-softokn/nss-softokn-config.in b/pkgs/core/nss-softokn/nss-softokn-config.in new file mode 100644 index 0000000..f46ba24 --- /dev/null +++ b/pkgs/core/nss-softokn/nss-softokn-config.in @@ -0,0 +1,116 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <<EOF +Usage: nss-softokn-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--includedir[=DIR]] + [--libdir[=DIR]] + [--version] + [--libs] + [--cflags] +Dynamic Libraries: + softokn3 - Requires full dynamic linking + freebl3 - for internal use only (and glibc for self-integrity check) + nssdbm3 - for internal use only +Dymamically linked +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +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 + ;; + *) + 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-softokn` +fi +if test -z "$includedir"; then + includedir=`pkg-config --variable=includedir nss-softokn` +fi +if test -z "$libdir"; then + libdir=`pkg-config --variable=libdir nss-softokn` +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" + echo $libdirs +fi + diff --git a/pkgs/core/nss-softokn/nss-softokn.nm b/pkgs/core/nss-softokn/nss-softokn.nm new file mode 100644 index 0000000..b44ab3c --- /dev/null +++ b/pkgs/core/nss-softokn/nss-softokn.nm @@ -0,0 +1,131 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = nss-softokn +PKG_VER = 3.12.8 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.mozilla.org/projects/security/pki/nss/ +PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+ +PKG_SUMMARY = Network Security Services Softoken Module. + +PKG_BUILD_DEPS+= nspr-devel nss-util-devel perl pkg-config psmisc sqlite-devel \ + zlib-devel + +define PKG_DESCRIPTION + Network Security Services Softoken Cryptographic Module. +endef + +PKG_TARBALL = $(THISAPP)-stripped.tar.bz2 + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +PKG_DEPS-$(PKG_NAME_REAL)-devel += nss-util-devel + +# Mozilla does no versioning :( +define PKG_FILES-$(PKG_NAME_REAL)-devel + /usr/bin/*-config + /usr/include + /usr/lib/libfreebl3.so + /usr/lib/pkgconfig +endef + +## Define some global environment variables + +export FREEBL_NO_DEPEND=1 +export FREEBL_USE_PRELINK=1 + +# Enable compiler optimizations and disable debugging code +export BUILD_OPT=1 +export XCFLAGS=$(CFLAGS) + +export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 +export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + +export NSPR_INCLUDE_DIR=/usr/include/nspr4 +export NSPR_LIB_DIR=/usr/lib + +export NSS_INCLUDE_DIR=/usr/include/nss3 +export NSS_LIB_DIR=/usr/lib + +export NSS_USE_SYSTEM_SQLITE=1 + +define STAGE_BUILD + cd $(DIR_APP) && make -C ./mozilla/security/coreconf + cd $(DIR_APP) && make -C ./mozilla/security/dbm + cd $(DIR_APP) && make -C ./mozilla/security/nss +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/lib + -mkdir -pv $(BUILDROOT)/usr/include/nss3 + -mkdir -pv $(BUILDROOT)/usr/{bin,lib} + -mkdir -pv $(BUILDROOT)/usr/lib/pkgconfig + -mkdir -pv $(BUILDROOT)/usr/lib/nss/unsupported-tools + + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libsoftokn3.so \ + $(BUILDROOT)/usr/lib + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnssdbm3.so \ + $(BUILDROOT)/usr/lib + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libfreebl3.so \ + $(BUILDROOT)/lib + ln -svf ../../lib/libfreebl3.so $(BUILDROOT)/usr/lib/libfreebl3.so + + # Copy the binaries we ship as unsupported + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/shlibsign $(BUILDROOT)/usr/lib/nss/unsupported-tools + + sed -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr,g" \ + -e "s,@exec_prefix@,/usr,g" \ + -e "s,@includedir@,/usr/include/nss3,g" \ + -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMAJOR" $(DIR_APP)/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ + -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*SOFTOKEN_VMINOR" $(DIR_APP)/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ + -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*SOFTOKEN_VPATCH" $(DIR_APP)/mozilla/security/nss/lib/softoken/softkver.h | awk '{print $3}'),g" \ + < $(DIR_SOURCE)/nss-softokn-config.in \ + > $(BUILDROOT)/usr/bin/nss-softokn-config + chmod -v 755 $(BUILDROOT)/usr/bin/nss-softokn-config + + # XXX need to fix this + sed \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr,g" \ + -e "s,%includedir%,/usr/include/nss3,g" \ + -e "s,%NSS_VERSION%,$(PKG_VER),g" \ + -e "s,%NSPR_VERSION%,$$(nspr-config --version),g" \ + -e "s,%NSSUTIL_VERSION%,$$(nss-util-config --version),g" \ + -e "s,%SOFTOKEN_VERSION%,$(PKG_VER),g" \ + < $(DIR_SOURCE)/nss-softokn.pc.in \ + > $(BUILDROOT)/usr/lib/pkgconfig/nss-softokn.pc + + # Copy the include files we want + cp -vf $(DIR_APP)/mozilla/dist/public/nss/*.h $(BUILDROOT)/usr/include/nss3 + cp -vf $(DIR_APP)/mozilla/dist/private/nss/blapi.h \ + $(BUILDROOT)/usr/include/nss3 + chmod -v 644 $(BUILDROOT)/usr/include/nss3/*.h +endef diff --git a/pkgs/core/nss-softokn/nss-softokn.pc.in b/pkgs/core/nss-softokn/nss-softokn.pc.in new file mode 100644 index 0000000..b7fc3d1 --- /dev/null +++ b/pkgs/core/nss-softokn/nss-softokn.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS-SOFTOKN +Description: Network Security Services Softoken PKCS #11 Module +Version: %SOFTOKEN_VERSION% +Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION% +Libs: -lfreebl3 -lnssdbm3 -lsoftokn3 +Cflags: -I${includedir} diff --git a/pkgs/core/nss-softokn/nss-softokn.spec b/pkgs/core/nss-softokn/nss-softokn.spec new file mode 100644 index 0000000..9f405d3 --- /dev/null +++ b/pkgs/core/nss-softokn/nss-softokn.spec @@ -0,0 +1,462 @@ +%global nspr_version 4.8.6 +%global nss_name nss +%global nss_util_version 3.12.8 +%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools +%global saved_files_dir %{_libdir}/nss/saved + +# Produce .chk files for the final stripped binaries +%define __spec_install_post \ + %{?__debug_package:%{__debug_install_post}} \ + %{__arch_install_post} \ + %{__os_install_post} \ + $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libsoftokn3.so \ + $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \ + $RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_libdir}/libnssdbm3.so \ +%{nil} + +Summary: Network Security Services Softoken Module +Name: nss-softokn +Version: 3.12.8 +Release: 2%{?dist} +License: MPLv1.1 or GPLv2+ or LGPLv2+ +URL: http://www.mozilla.org/projects/security/pki/nss/ +Group: System Environment/Libraries +Requires: nspr >= %{nspr_version} +Requires: nss-util >= %{nss_util_version} +Requires: nss-softokn-freebl%{_isa} >= %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: nspr-devel >= %{nspr_version} +BuildRequires: nss-util-devel >= %{nss_util_version} +BuildRequires: sqlite-devel +BuildRequires: zlib-devel +BuildRequires: pkgconfig +BuildRequires: gawk +BuildRequires: psmisc +BuildRequires: perl + +Source0: %{name}-%{version}-stripped.tar.bz2 +# The nss-softokn tar ball is a subset of nss-{version}-stripped.tar.bz2, +# Therefore we use the nss-split-softokn.sh script to keep only what we need. +# Download the nss tarball via git from the nss propect and follow these +# steps to make the tarball for nss-util out of the one for nss: +# fedpkg clone nss +# fedpkg clone nss-softokn +# cd nss-softokn +# cp ../../nss/devel/${version}-stripped.tar.bz2 . +# sh ./nss-split-softokn.sh ${version} +# A file named {name}-{version}-stripped.tar.bz2 should appear +Source1: nss-split-softokn.sh +Source2: nss-softokn.pc.in +Source3: nss-softokn-config.in + +Patch2: nss-softokn-3.12.4-prelink.patch +Patch3: nss-softokn-3.12.4-fips-fix.patch + +%description +Network Security Services Softoken Cryptographic Module + +%package freebl +Summary: Freebl library for the Network Security Services +Group: System Environment/Base +Conflicts: nss < 3.12.2.99.3-5 +Conflicts: prelink < 0.4.3 + +%description freebl +NSS Softoken Cryptographic Module Freelb Library + +Install the nss-softokn-freebl package if you need the freebl +library. + +%package freebl-devel +Summary: Header and Library files for doing development with the Freebl library for NSS +Group: System Environment/Base +Provides: nss-softokn-freebl-static = %{version}-%{release} +Requires: nss-softokn-freebl%{?_isa} = %{version}-%{release} + +%description freebl-devel +NSS Softoken Cryptographic Module Freelb Library Development Tools + +%package devel +Summary: Development libraries for Network Security Services +Group: Development/Libraries +Requires: nss-softokn%{?_isa} = %{version}-%{release} +Requires: nspr-devel >= %{nspr_version} +Requires: nss-util-devel >= %{nss_util_version} +Requires: pkgconfig +BuildRequires: nspr-devel >= %{nspr_version} +BuildRequires: nss-util-devel >= %{nss_util_version} +# require nss at least the version when we split via subpackages +BuildRequires: nss-devel >= 3.12.2.99.3-11 + +%description devel +Header and Library files for doing development with Network Security Services. + + +%prep +%setup -q + +%patch2 -p0 -b .prelink +%patch3 -p0 -b .fipsfix + + +%build + +FREEBL_NO_DEPEND=1 +export FREEBL_NO_DEPEND + +FREEBL_USE_PRELINK=1 +export FREEBL_USE_PRELINK + +# Enable compiler optimizations and disable debugging code +BUILD_OPT=1 +export BUILD_OPT + +# Generate symbolic info for debuggers +XCFLAGS=$RPM_OPT_FLAGS +export XCFLAGS + +PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 +PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + +export PKG_CONFIG_ALLOW_SYSTEM_LIBS +export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS + +NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'` +NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'` + +export NSPR_INCLUDE_DIR +export NSPR_LIB_DIR + +NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'` +NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss-util | sed 's/-L//'` + +export NSS_INCLUDE_DIR +export NSS_LIB_DIR + +NSS_USE_SYSTEM_SQLITE=1 +export NSS_USE_SYSTEM_SQLITE + +%ifarch x86_64 ppc64 ia64 s390x sparc64 +USE_64=1 +export USE_64 +%endif + +# Compile softokn plus needed support +%{__make} -C ./mozilla/security/coreconf +%{__make} -C ./mozilla/security/dbm +%{__make} -C ./mozilla/security/nss + +# Set up our package file +# The nspr_version and nss_util_version globals used here +# must match the ones nss-softokn has for its Requires. +%{__mkdir_p} ./mozilla/dist/pkgconfig +%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \ + -e "s,%%prefix%%,%{_prefix},g" \ + -e "s,%%exec_prefix%%,%{_prefix},g" \ + -e "s,%%includedir%%,%{_includedir}/nss3,g" \ + -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \ + -e "s,%%NSSUTIL_VERSION%%,%{nss_util_version},g" \ + -e "s,%%SOFTOKEN_VERSION%%,%{version},g" > \ + ./mozilla/dist/pkgconfig/nss-softokn.pc + +SOFTOKEN_VMAJOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMAJOR" | awk '{print $3}'` +SOFTOKEN_VMINOR=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VMINOR" | awk '{print $3}'` +SOFTOKEN_VPATCH=`cat mozilla/security/nss/lib/softoken/softkver.h | grep "#define.*SOFTOKEN_VPATCH" | awk '{print $3}'` + +export SOFTOKEN_VMAJOR +export SOFTOKEN_VMINOR +export SOFTOKEN_VPATCH + +%{__cat} %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \ + -e "s,@prefix@,%{_prefix},g" \ + -e "s,@exec_prefix@,%{_prefix},g" \ + -e "s,@includedir@,%{_includedir}/nss3,g" \ + -e "s,@MOD_MAJOR_VERSION@,$SOFTOKEN_VMAJOR,g" \ + -e "s,@MOD_MINOR_VERSION@,$SOFTOKEN_VMINOR,g" \ + -e "s,@MOD_PATCH_VERSION@,$SOFTOKEN_VPATCH,g" \ + > ./mozilla/dist/pkgconfig/nss-softokn-config + +chmod 755 ./mozilla/dist/pkgconfig/nss-softokn-config + + +# enable the following line to force a test failure +# find ./mozilla -name *.chk | xargs rm -f + +# +# We can't run a subset of the tests because the tools have +# dependencies on nss libraries outside of softokn. +# Let's leave this as a place holder. +# + + +%install + +%{__rm} -rf $RPM_BUILD_ROOT + +# There is no make install target so we'll do it ourselves. + +%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3 +%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir} +%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir} +%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib} +%{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory} +%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig +%{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir} + +# Copy the binary libraries we want +for file in libsoftokn3.so libnssdbm3.so +do + %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} +done + +# Because libcrypt depends on libfreebl3.so, it is special +# so we install it in /lib{64}, keeping a symbolic link to it +# back in /usr/lib{64} to keep everyone else working +for file in libfreebl3.so +do + %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib} + ln -sf ../../%{_lib}/libfreebl3.so $RPM_BUILD_ROOT/%{_libdir}/libfreebl3.so +done + +# Make sure chk files can be found in both places +for file in libfreebl3.chk +do + ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file +done + +# Copy the binaries we ship as unsupported +for file in shlibsign +do + %{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory} +done + +# Copy the include files we want +for file in mozilla/dist/public/nss/*.h +do + %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3 +done + +# Copy a freebl include file we also want +for file in mozilla/dist/private/nss/blapi.h +do + %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3 +done + +# Copy the static freebl library +for file in libfreebl.a +do +%{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} +done + +# Copy the package configuration files +%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss-softokn.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-softokn.pc +%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-softokn-config $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + + +%post +/sbin/ldconfig >/dev/null 2>/dev/null + +%postun +/sbin/ldconfig >/dev/null 2>/dev/null + +%files +%defattr(-,root,root) +%{_libdir}/libnssdbm3.so +%{_libdir}/libnssdbm3.chk +%{_libdir}/libsoftokn3.so +%{_libdir}/libsoftokn3.chk +# shared with nss-tools +%dir %{_libdir}/nss +%dir %{saved_files_dir} +%dir %{unsupported_tools_directory} +%{unsupported_tools_directory}/shlibsign + +%files freebl +%defattr(-,root,root) +/%{_lib}/libfreebl3.so +/%{_lib}/libfreebl3.chk +# and these symbolic links +%{_libdir}/libfreebl3.so +%{_libdir}/libfreebl3.chk + +%files freebl-devel +%defattr(-,root,root) +%{_libdir}/libfreebl.a +%{_includedir}/nss3/blapi.h + +%files devel +%defattr(-,root,root) +%{_libdir}/pkgconfig/nss-softokn.pc +%{_bindir}/nss-softokn-config + +# co-owned with nss +%dir %{_includedir}/nss3 +# +# The following headers are those exported public in +# mozilla/security/nss/lib/freebl/manifest.mn and +# mozilla/security/nss/lib/softoken/manifest.mn +# +# The following list is short because many headers, such as +# the pkcs #11 ones, have been provided by nss-util-devel +# which installed them before us. +# +%{_includedir}/nss3/blapit.h +%{_includedir}/nss3/ecl-exp.h +%{_includedir}/nss3/hasht.h +%{_includedir}/nss3/sechash.h +%{_includedir}/nss3/nsslowhash.h +%{_includedir}/nss3/secmodt.h +%{_includedir}/nss3/shsign.h + +%changelog +* Wed Sep 29 2010 jkeating - 3.12.8-2 +- Rebuilt for gcc bug 634757 + +* Thu Sep 23 2010 Elio Maldonado emaldona@redhat.com - 3.12.8-1 +- Update to 3.12.8 +- Adhere to static library packaging guidelines (#609613) +- Fix nss-util-devel version dependency line +- Shorten freebl and freebl subpackages descriptions + +* Sat Sep 18 2010 Elio Maldonado emaldona@redhat.com - 3.12.99.4-1 +- NSS 3.12.8 RC0 + +* Sat Sep 12 2010 Elio Maldonado emaldona@redhat.com - 3.12.7.99.3-2 +- Update the required version of nss-util to 3.12.7.99.3 + +* Sat Sep 04 2010 Elio Maldonado emaldona@redhat.com - 3.12.7.99.3-1 +- NSS 3.12.8 Beta 3 + +* Mon Aug 30 2010 Elio Maldonado emaldona@redhat.com - 3.12.7-3 +- Update BuildRequires on nspr-devel and nss-util-devel + +* Sat Aug 29 2010 Elio Maldonado emaldona@redhat.com - 3.12.7-2 +- Define NSS_USE_SYSTEM_SQLITE and remove nss-nolocalsql patch +- Fix rpmlint warnings about macros in comments and changelog + +* Mon Aug 16 2010 Elio Maldonado emaldona@redhat.com - 3.12.7-1 +- Update to 3.12.7 +- Fix build files to ensure nsslowhash.h is included in public headers + +* Tue Jun 08 2010 Elio Maldonado emaldona@redhat.com - 3.12.6-3 +- Retagging + +* Mon Jun 07 2010 Elio Maldonado emaldona@redhat.com - 3.12.6-2 +- Bump NVR to be greater than those for nss-softokn subpackages in F11 (rhbz#601407) + +* Sun Jun 06 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-23 +- Bump release number + +* Fri Jun 04 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-22 +- Cleanup changelog comments to avoid unwanted macro expansions + +* Wed Jun 02 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-21 +- Retagging + +* Wed Jun 02 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-20 +- Add %%{?_isa} to the requires in the devel packages (#596840) +- Fix typo in the package description (#598295) +- Update nspr version to 4.8.4 + +* Sat May 08 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-19 +- Consider the system as not fips enabled when /proc/sys/crypto/fips_enabled isn't present (rhbz#590199) + +* Sat May 08 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-18 +- Fix Conflicts line to prevent update when prelink is not yet the right version (rhbz#590199) + +* Mon Apr 19 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-17 +- Updated prelink patch rhbz#504949 + +* Wed Apr 15 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-16 +- allow prelink of softoken and freebl. Change the verify code to use + prelink -u if prelink is installed. Fix by Robert Relyea rhbz#504949 + +* Mon Jan 18 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-15 +- Move libfreebl3.so and its .chk file to /lib{64} (rhbz#561544) + +* Mon Jan 18 2010 Elio Maldonado emaldona@redhat.com - 3.12.4-13 +- Fix in nss-softokn-spec.in +- Require nss-util >= 3.12.4 + +* Thu Dec 03 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-12 +- Require nss-util 3.12.5 + +* Fri Nov 20 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-11 +- export freebl devel tools (#538226) + +* Tue Sep 23 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-10 +- Fix paths in nss-softokn-prelink so signed libraries don't get touched, rhbz#524794 + +* Thu Sep 17 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-9 +- Add nssdbm3.so to nss-softokn-prelink.conf, rhbz#524077 + +* Thu Sep 10 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-8 +- Retagging for a chained build + +* Thu Sep 10 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-6 +- Don't list libraries in nss-softokn-config, dynamic linking required + +* Tue Sep 08 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-5 +- Installing shared libraries to %%{_libdir} + +* Sun Sep 06 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-4 +- Postuninstall scriptlet finishes quietly + +* Sat Sep 05 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-3 +- Remove symblic links to shared libraries from devel, rhbz#521155 +- Apply the nss-nolocalsql patch +- No rpath-link in nss-softokn-config + +* Fri Sep 04 2009 serstring=Elio Maldonadoemaldona@redhat.cpm - 3.12.4-2 +- Retagging to pick up the correct .cvsignore + +* Tue Sep 01 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-1 +- Update to 3.12.4 +- Fix logic on postun +- Don't require sqlite + +* Mon Aug 31 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-24 +- Fixed test on %postun to avoid returning 1 when nss-softokn instances still remain + +* Sun Aug 30 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-23 +- Explicitly state via nss_util_version the nss-util version we require + +* Fri Aug 28 2009 Warren Togami wtogami@redhat.com - 3.12.3.99.3-22 +- caolan's nss-softokn.pc patch + +* Thu Aug 27 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-21 +- Bump the release number for a chained build of nss-util, nss-softokn and nss + +* Thu Aug 27 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-20 +- List freebl, nssdbm and softokn libraries in nss-softokn-config and nss-softokn.pc + +* Thu Aug 27 2009 Elio Maldonado@emaldona@redhat.com - 3.12.3.99.3-19 +- Determine NSSUTIL_INCLUDE_DIR and NSSUTIL_LIB_DIR with a pkg-config query on nss-util +- Remove the release 17 hack + +* Wed Aug 27 2009 Elio maldonadoemaldona@redhat.com - 3.12.3.99.3-18 +- fix spurious executable permissions on nss-softokn.pc + +* Thu Aug 27 2009 Adel Gadllah adel.gadllah@gmail.com - 3.12.3.99.3-17 +- Add hack to fix build + +* Tue Aug 25 2009 Dennis Gilmore dennis@ausil.us - 3.12.3.99.3-16 +- only have a single Requires: line in the .pc file + +* Tue Aug 25 2009 Dennis Gilmore dennis@ausil.us - 3.12.3.99.3-12 +- bump to unique rpm nvr + +* Tue Aug 25 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-10 +- Build after nss with subpackages and new nss-util + +* Thu Aug 20 2009 Dennis Gilmore dennis@ausil.us 3.12.3.99.3-9 +- revert to shipping bits + +* Thu Aug 19 2009 Elio Maldonado emaldona@redhat.com 3.12.3.99.3-8.1 +- Disable installing until conflicts are relsoved + +* Thu Aug 19 2009 Elio Maldonado emaldona@redhat.com 3.12.3.99.3-8 +- Initial build diff --git a/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch b/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch new file mode 100644 index 0000000..011a148 --- /dev/null +++ b/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-fips-fix.patch @@ -0,0 +1,12 @@ +diff -up ./mozilla/security/nss/lib/freebl/nsslowhash.c.fips ./mozilla/security/nss/lib/freebl/nsslowhash.c +--- ./mozilla/security/nss/lib/freebl/nsslowhash.c.fips 2010-09-04 20:23:14.764313661 -0700 ++++ ./mozilla/security/nss/lib/freebl/nsslowhash.c 2010-09-04 20:25:52.622313780 -0700 +@@ -275,7 +275,7 @@ static int nsslow_GetFIPSEnabled(void) { + + f = fopen("/proc/sys/crypto/fips_enabled", "r"); + if (!f) +- return 1; ++ return 0; + + size = fread(&d, 1, 1, f); + fclose(f); diff --git a/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch b/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch new file mode 100644 index 0000000..5f2e46f --- /dev/null +++ b/pkgs/core/nss-softokn/patches/nss-softokn-3.12.4-prelink.patch @@ -0,0 +1,298 @@ +diff -up ./mozilla/security/nss/lib/freebl/Makefile.prelink ./mozilla/security/nss/lib/freebl/Makefile +--- ./mozilla/security/nss/lib/freebl/Makefile.prelink 2010-09-04 14:13:58.846327263 -0700 ++++ ./mozilla/security/nss/lib/freebl/Makefile 2010-09-04 14:15:11.544326993 -0700 +@@ -82,6 +82,12 @@ ifeq ($(FREEBL_NO_DEPEND),1) + else + MAPFILE_SOURCE = freebl.def + endif ++ifdef FREEBL_USE_PRELINK ++ DEFINES += -DFREEBL_USE_PRELINK ++endif ++ifdef FREEBL_PRELINK_COMMAND ++ DEFINES +=-DFREEBL_PRELINK_COMMAND="$(FREEBL_PRELINK_COMMAND)" ++endif + # NSS_X86 means the target is a 32-bits x86 CPU architecture + # NSS_X64 means the target is a 64-bits x64 CPU architecture + # NSS_X86_OR_X64 means the target is either x86 or x64 +diff -up ./mozilla/security/nss/lib/freebl/shvfy.c.prelink ./mozilla/security/nss/lib/freebl/shvfy.c +--- ./mozilla/security/nss/lib/freebl/shvfy.c.prelink 2010-09-04 14:16:01.518326988 -0700 ++++ ./mozilla/security/nss/lib/freebl/shvfy.c 2010-09-04 14:25:44.770326384 -0700 +@@ -48,6 +48,168 @@ + #include "stdio.h" + #include "prmem.h" + ++#ifdef FREEBL_USE_PRELINK ++#ifndef FREELB_PRELINK_COMMAND ++#define FREEBL_PRELINK_COMMAND "/usr/sbin/prelink -u -o -" ++#endif ++#include "private/pprio.h" ++ ++#include <stdlib.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <sys/wait.h> ++#include <sys/stat.h> ++ ++PRFileDesc * ++bl_OpenUnPrelink(const char *shName, int *pid) ++{ ++ char *command= strdup(FREEBL_PRELINK_COMMAND); ++ char *argString = NULL; ++ char **argv = NULL; ++ char *shNameArg = NULL; ++ char *cp; ++ pid_t child; ++ int argc = 0, argNext = 0; ++ struct stat statBuf; ++ int pipefd[2] = {-1,-1}; ++ int ret; ++ ++ *pid = 0; ++ ++ /* make sure the prelink command exists first. If not, fall back to ++ * just reading the file */ ++ for (cp = command; *cp ; cp++) { ++ if (*cp == ' ') { ++ *cp++ = 0; ++ argString = cp; ++ break; ++ } ++ } ++ memset (&statBuf, 0, sizeof(statBuf)); ++ /* stat the file, follow the link */ ++ ret = stat(command, &statBuf); ++ if (ret < 0) { ++ free(command); ++ return PR_Open(shName, PR_RDONLY, 0); ++ } ++ /* file exits, make sure it's an executable */ ++ if (!S_ISREG(statBuf.st_mode) || ++ ((statBuf.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0)) { ++ free(command); ++ return PR_Open(shName, PR_RDONLY, 0); ++ } ++ ++ /* OK, the prelink command exists and looks correct, use it */ ++ /* build the arglist while we can still malloc */ ++ /* count the args if any */ ++ if (argString && *argString) { ++ /* argString may have leading spaces, strip them off*/ ++ for (cp = argString; *cp && *cp == ' '; cp++); ++ argString = cp; ++ if (*cp) { ++ /* there is at least one arg.. */ ++ argc = 1; ++ } ++ ++ /* count the rest: Note there is no provision for escaped ++ * spaces here */ ++ for (cp = argString; *cp ; cp++) { ++ if (*cp == ' ') { ++ while (*cp && *cp == ' ') cp++; ++ if (*cp) argc++; ++ } ++ } ++ } ++ ++ /* add the additional args: argv[0] (command), shName, NULL*/ ++ argc += 3; ++ argv = PORT_NewArray(char *, argc); ++ if (argv == NULL) { ++ goto loser; ++ } ++ ++ /* fill in the arglist */ ++ argv[argNext++] = command; ++ if (argString && *argString) { ++ argv[argNext++] = argString; ++ for (cp = argString; *cp; cp++) { ++ if (*cp == ' ') { ++ *cp++ = 0; ++ while (*cp && *cp == ' ') cp++; ++ if (*cp) argv[argNext++] = cp; ++ } ++ } ++ } ++ /* exec doesn't advertise taking const char **argv, do the paranoid ++ * copy */ ++ shNameArg = strdup(shName); ++ if (shNameArg == NULL) { ++ goto loser; ++ } ++ argv[argNext++] = shNameArg; ++ argv[argNext++] = 0; ++ ++ ret = pipe(pipefd); ++ if (ret < 0) { ++ goto loser; ++ } ++ ++ /* use vfork() so we don't trigger the pthread_at_fork() handlers */ ++ child = vfork(); ++ if (child < 0) goto loser; ++ if (child == 0) { ++ /* set up the file descriptors */ ++ close(0); ++ /* associate pipefd[1] with stdout */ ++ if (pipefd[1] != 1) dup2(pipefd[1], 1); ++ close(2); ++ close(pipefd[0]); ++ /* should probably close the other file descriptors? */ ++ ++ ++ execv(command, argv); ++ /* avoid at_exit() handlers */ ++ _exit(1); /* shouldn't reach here except on an error */ ++ } ++ close(pipefd[1]); ++ pipefd[1] = -1; ++ ++ /* this is safe because either vfork() as full fork() semantics, and thus ++ * already has it's own address space, or because vfork() has paused ++ * the parent util the exec or exit */ ++ free(command); ++ free(shNameArg); ++ PORT_Free(argv); ++ ++ *pid = child; ++ ++ return PR_ImportPipe(pipefd[0]); ++ ++loser: ++ if (pipefd[0] != -1) { ++ close(pipefd[0]); ++ } ++ if (pipefd[1] != -1) { ++ close(pipefd[1]); ++ } ++ free(command); ++ free(shNameArg); ++ PORT_Free(argv); ++ ++ return NULL; ++} ++ ++void ++bl_CloseUnPrelink( PRFileDesc *file, int pid) ++{ ++ /* close the file descriptor */ ++ PR_Close(file); ++ /* reap the child */ ++ if (pid) { ++ waitpid(pid, NULL, 0); ++ } ++} ++#endif + + /* #define DEBUG_SHVERIFY 1 */ + +@@ -117,6 +279,9 @@ BLAPI_SHVerify(const char *name, PRFuncP + SECStatus rv; + DSAPublicKey key; + int count; ++#ifdef FREEBL_USE_PRELINK ++ int pid = 0; ++#endif + + PRBool result = PR_FALSE; /* if anything goes wrong, + * the signature does not verify */ +@@ -197,7 +362,11 @@ BLAPI_SHVerify(const char *name, PRFuncP + checkFD = NULL; + + /* open our library file */ ++#ifdef FREEBL_USE_PRELINK ++ shFD = bl_OpenUnPrelink(shName,&pid); ++#else + shFD = PR_Open(shName, PR_RDONLY, 0); ++#endif + if (shFD == NULL) { + #ifdef DEBUG_SHVERIFY + fprintf(stderr, "Failed to open the library file %s: (%d, %d)\n", +@@ -218,7 +387,11 @@ BLAPI_SHVerify(const char *name, PRFuncP + SHA1_Update(hashcx, buf, bytesRead); + count += bytesRead; + } ++#ifdef FREEBL_USE_PRELINK ++ bl_CloseUnPrelink(shFD, pid); ++#else + PR_Close(shFD); ++#endif + shFD = NULL; + + SHA1_End(hashcx, hash.data, &hash.len, hash.len); +diff -up ./mozilla/security/nss/lib/freebl/stubs.c.prelink ./mozilla/security/nss/lib/freebl/stubs.c +--- ./mozilla/security/nss/lib/freebl/stubs.c.prelink 2010-09-04 14:26:27.454327120 -0700 ++++ ./mozilla/security/nss/lib/freebl/stubs.c 2010-09-04 14:31:56.778327428 -0700 +@@ -69,6 +69,7 @@ + #include <secport.h> + #include <secitem.h> + #include <blapi.h> ++#include <private/pprio.h> + + #define FREEBL_NO_WEAK 1 + +@@ -157,6 +158,8 @@ STUB_DECLARE(void,PR_Lock,(PRLock *lock) + STUB_DECLARE(PRLock *,PR_NewLock,(void)); + STUB_DECLARE(PRFileDesc *,PR_Open,(const char *name, PRIntn flags, + PRIntn mode)); ++STUB_DECLARE(PRFileDesc *,PR_ImportFile,(PROsfd osfd)); ++STUB_DECLARE(PRFileDesc *,PR_ImportPipe,(PROsfd osfd)); + STUB_DECLARE(PRInt32,PR_Read,(PRFileDesc *fd, void *buf, PRInt32 amount)); + STUB_DECLARE(PROffset32,PR_Seek,(PRFileDesc *fd, PROffset32 offset, + PRSeekWhence whence)); +@@ -295,6 +298,34 @@ PR_Open_stub(const char *name, PRIntn fl + return (PRFileDesc *)lfd; + } + ++extern PRFileDesc * ++PR_ImportFile_stub(PROsfd fd) ++{ ++ int *lfd = NULL; ++ ++ STUB_SAFE_CALL1(PR_ImportFile, fd); ++ ++ lfd = PORT_New_stub(int); ++ if (lfd != NULL) { ++ *lfd = fd; ++ } ++ return (PRFileDesc *)lfd; ++} ++ ++extern PRFileDesc * ++PR_ImportPipe_stub(PROsfd fd) ++{ ++ int *lfd = NULL; ++ ++ STUB_SAFE_CALL1(PR_ImportPipe, fd); ++ ++ lfd = PORT_New_stub(int); ++ if (lfd != NULL) { ++ *lfd = fd; ++ } ++ return (PRFileDesc *)lfd; ++} ++ + extern PRStatus + PR_Close_stub(PRFileDesc *fd) + { +@@ -492,6 +523,8 @@ freebl_InitNSPR(void *lib) + { + STUB_FETCH_FUNCTION(PR_Free); + STUB_FETCH_FUNCTION(PR_Open); ++ STUB_FETCH_FUNCTION(PR_ImportFile); ++ STUB_FETCH_FUNCTION(PR_ImportPipe); + STUB_FETCH_FUNCTION(PR_Close); + STUB_FETCH_FUNCTION(PR_Read); + STUB_FETCH_FUNCTION(PR_Seek); +diff -up ./mozilla/security/nss/lib/freebl/stubs.h.prelink ./mozilla/security/nss/lib/freebl/stubs.h +--- ./mozilla/security/nss/lib/freebl/stubs.h.prelink 2010-09-04 14:26:41.822327256 -0700 ++++ ./mozilla/security/nss/lib/freebl/stubs.h 2010-09-04 14:32:53.498540767 -0700 +@@ -78,6 +78,8 @@ + #define PR_Lock PR_Lock_stub + #define PR_NewLock PR_NewLock_stub + #define PR_Open PR_Open_stub ++#define PR_ImportFile PR_ImportFile_stub ++#define PR_ImportPipe PR_ImportPipe_stub + #define PR_Read PR_Read_stub + #define PR_Seek PR_Seek_stub + #define PR_Sleep PR_Sleep_stub diff --git a/pkgs/core/nss-util/nss-util-config.in b/pkgs/core/nss-util/nss-util-config.in new file mode 100644 index 0000000..ef8751d --- /dev/null +++ b/pkgs/core/nss-util/nss-util-config.in @@ -0,0 +1,118 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <<EOF +Usage: nss-util-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--includedir[=DIR]] + [--libdir[=DIR]] + [--version] + [--libs] + [--cflags] +Dynamic Libraries: + nssutil +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +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 + ;; + *) + 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-util` +fi +if test -z "$includedir"; then + includedir=`pkg-config --variable=includedir nss-util` +fi +if test -z "$libdir"; then + libdir=`pkg-config --variable=libdir nss-util` +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_nssutil"; then + libdirs="$libdirs -lnssutil${major_version}" + fi + echo $libdirs +fi + diff --git a/pkgs/core/nss-util/nss-util.nm b/pkgs/core/nss-util/nss-util.nm new file mode 100644 index 0000000..01a4c36 --- /dev/null +++ b/pkgs/core/nss-util/nss-util.nm @@ -0,0 +1,109 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = nss-util +PKG_VER = 3.12.8 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.mozilla.org/projects/security/pki/nss/ +PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+ +PKG_SUMMARY = Network Security Services Utilities Library. + +PKG_BUILD_DEPS+= nspr-devel perl pkg-config psmisc zlib-devel + +define PKG_DESCRIPTION + Utilities for Network Security Services and the Softoken module. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +PKG_DEPS-$(PKG_NAME_REAL)-devel = $(PKG_NAME_REAL) + +# Mozilla does no versioning :( +define PKG_FILES-$(PKG_NAME_REAL)-devel + /usr/bin/*-config + /usr/include + /usr/lib/pkgconfig +endef + +## Define some global environment variables +# Enable compiler optimizations and disable debugging code +export BUILD_OPT=1 +export XCFLAGS=$(CFLAGS) + +export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 +export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + +export NSPR_INCLUDE_DIR=/usr/include/nspr4 +export NSPR_LIB_DIR=/usr/lib + +export NSS_INCLUDE_DIR=/usr/include/nss3 +export NSS_LIB_DIR=/usr/lib + +export NSS_USE_SYSTEM_SQLITE=1 + +define STAGE_BUILD + cd $(DIR_APP) && make -C ./mozilla/security/coreconf + cd $(DIR_APP) && make -C ./mozilla/security/nss +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/usr/bin + -mkdir -pv $(BUILDROOT)/usr/include/nss3 + -mkdir -pv $(BUILDROOT)/usr/lib/pkgconfig + + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnssutil3.so \ + $(BUILDROOT)/usr/lib + + sed -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr,g" \ + -e "s,@exec_prefix@,/usr,g" \ + -e "s,@includedir@,/usr/include/nss3,g" \ + -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*NSSUTIL_VMAJOR" $(DIR_APP)/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ + -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*NSSUTIL_VMINOR" $(DIR_APP)/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ + -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*NSSUTIL_VPATCH" $(DIR_APP)/mozilla/security/nss/lib/util/nssutil.h | awk '{print $3}'),g" \ + < $(DIR_SOURCE)/nss-util-config.in \ + > $(BUILDROOT)/usr/bin/nss-util-config + chmod -v 755 $(BUILDROOT)/usr/bin/nss-util-config + + sed \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr,g" \ + -e "s,%includedir%,/usr/include/nss3,g" \ + -e "s,%NSPR_VERSION%,$$(nspr-config --version),g" \ + -e "s,%NSSUTIL_VERSION%,$(PKG_NAME),g" \ + < $(DIR_SOURCE)/nss-util.pc.in \ + > $(BUILDROOT)/usr/lib/pkgconfig/nss-util.pc + + # The util headers, the rest come from softokn and nss + cp -vf $(DIR_APP)/mozilla/dist/public/nss/*.h $(BUILDROOT)/usr/include/nss3 + chmod -v 644 $(BUILDROOT)/usr/include/nss3/*.h +endef diff --git a/pkgs/core/nss-util/nss-util.pc.in b/pkgs/core/nss-util/nss-util.pc.in new file mode 100644 index 0000000..079f83f --- /dev/null +++ b/pkgs/core/nss-util/nss-util.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS-UTIL +Description: Network Security Services Utility Library +Version: %NSSUTIL_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -lnssutil3 +Cflags: -I${includedir} diff --git a/pkgs/core/nss-util/nss-util.spec b/pkgs/core/nss-util/nss-util.spec new file mode 100644 index 0000000..4676bb5 --- /dev/null +++ b/pkgs/core/nss-util/nss-util.spec @@ -0,0 +1,278 @@ +%global nspr_version 4.8.6 + +Summary: Network Security Services Utilities Library +Name: nss-util +Version: 3.12.8 +Release: 2%{?dist} +License: MPLv1.1 or GPLv2+ or LGPLv2+ +URL: http://www.mozilla.org/projects/security/pki/nss/ +Group: System Environment/Libraries +Requires: nspr >= %{nspr_version} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: nspr-devel >= %{nspr_version} +BuildRequires: zlib-devel +BuildRequires: pkgconfig +BuildRequires: gawk +BuildRequires: psmisc +BuildRequires: perl + +Source0: %{name}-%{version}.tar.bz2 +# The nss-util tar ball is a subset of nss-{version}-stripped.tar.bz2, +# Therefore we use the nss-split-util.sh script to keeping only what we need. +# Download the nss tarball via CVS from the nss propect and follow these +# steps to make the r tarball for nss-util out of the for nss: +# fedpkg clone nss +# fedpkg clone nss-util +# cd nss-util/master +# cp ../../nss/devel/${version}-stripped.tar.bz2 . +# sh ./nss-split-util.sh ${version} +# A file named {name}-{version}.tar.bz2 should appear +Source1: nss-split-util.sh +Source2: nss-util.pc.in +Source3: nss-util-config.in + + +%description +Utilities for Network Security Services and the Softoken module + +# We shouln't need to have a devel subpackage as util will be used in the +# context of nss or nss-softoken. keeping to please rpmlint. +# +%package devel +Summary: Development libraries for Network Security Services Utilities +Group: Development/Libraries +Requires: nss-util = %{version}-%{release} +Requires: nspr-devel >= %{nspr_version} +Requires: pkgconfig + +%description devel +Header and library files for doing development with Network Security Services. + + +%prep +%setup -q + + +%build + +# Enable compiler optimizations and disable debugging code +BUILD_OPT=1 +export BUILD_OPT + +# Generate symbolic info for debuggers +XCFLAGS=$RPM_OPT_FLAGS +export XCFLAGS + +PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 +PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + +export PKG_CONFIG_ALLOW_SYSTEM_LIBS +export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS + +NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'` +NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'` + +export NSPR_INCLUDE_DIR +export NSPR_LIB_DIR + +NSS_USE_SYSTEM_SQLITE=1 +export NSS_USE_SYSTEM_SQLITE + +%ifarch x86_64 ppc64 ia64 s390x sparc64 +USE_64=1 +export USE_64 +%endif + +# make util +%{__make} -C ./mozilla/security/coreconf +%{__make} -C ./mozilla/security/nss + +# Set up our package file +%{__mkdir_p} ./mozilla/dist/pkgconfig +%{__cat} %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \ + -e "s,%%prefix%%,%{_prefix},g" \ + -e "s,%%exec_prefix%%,%{_prefix},g" \ + -e "s,%%includedir%%,%{_includedir}/nss3,g" \ + -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \ + -e "s,%%NSSUTIL_VERSION%%,%{version},g" > \ + ./mozilla/dist/pkgconfig/nss-util.pc + +NSSUTIL_VMAJOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMAJOR" | awk '{print $3}'` +NSSUTIL_VMINOR=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VMINOR" | awk '{print $3}'` +NSSUTIL_VPATCH=`cat mozilla/security/nss/lib/util/nssutil.h | grep "#define.*NSSUTIL_VPATCH" | awk '{print $3}'` + +export NSSUTIL_VMAJOR +export NSSUTIL_VMINOR +export NSSUTIL_VPATCH + +%{__cat} %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \ + -e "s,@prefix@,%{_prefix},g" \ + -e "s,@exec_prefix@,%{_prefix},g" \ + -e "s,@includedir@,%{_includedir}/nss3,g" \ + -e "s,@MOD_MAJOR_VERSION@,$NSSUTIL_VMAJOR,g" \ + -e "s,@MOD_MINOR_VERSION@,$NSSUTIL_VMINOR,g" \ + -e "s,@MOD_PATCH_VERSION@,$NSSUTIL_VPATCH,g" \ + > ./mozilla/dist/pkgconfig/nss-util-config + +chmod 755 ./mozilla/dist/pkgconfig/nss-util-config + + +%install + +%{__rm} -rf $RPM_BUILD_ROOT + +# There is no make install target so we'll do it ourselves. + +%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3 +%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir} +%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/nss3 +%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig +%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir} + +for file in libnssutil3.so +do + %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} +done + +# Copy the include files we want +# The util headers, the rest come from softokn and nss +for file in mozilla/dist/public/nss/*.h +do + %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3 +done + +# Copy the package configuration files +%{__install} -p -m 644 ./mozilla/dist/pkgconfig/nss-util.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss-util.pc +%{__install} -p -m 755 ./mozilla/dist/pkgconfig/nss-util-config $RPM_BUILD_ROOT/%{_bindir}/nss-util-config + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig >/dev/null 2>/dev/null + +%postun +/sbin/ldconfig >/dev/null 2>/dev/null + +%files +%defattr(-,root,root) +%{_libdir}/libnssutil3.so + +%files devel +%defattr(-,root,root) +# package configuration files +%{_libdir}/pkgconfig/nss-util.pc +%{_bindir}/nss-util-config + +# co-owned with nss +%dir %{_includedir}/nss3 +# these are marked as public export in +# mozilla/security/nss/lib/util/manifest.mk +%{_includedir}/nss3/base64.h +%{_includedir}/nss3/ciferfam.h +%{_includedir}/nss3/nssb64.h +%{_includedir}/nss3/nssb64t.h +%{_includedir}/nss3/nsslocks.h +%{_includedir}/nss3/nssilock.h +%{_includedir}/nss3/nssilckt.h +%{_includedir}/nss3/nssrwlk.h +%{_includedir}/nss3/nssrwlkt.h +%{_includedir}/nss3/nssutil.h +%{_includedir}/nss3/pkcs11.h +%{_includedir}/nss3/pkcs11f.h +%{_includedir}/nss3/pkcs11n.h +%{_includedir}/nss3/pkcs11p.h +%{_includedir}/nss3/pkcs11t.h +%{_includedir}/nss3/pkcs11u.h +%{_includedir}/nss3/portreg.h +%{_includedir}/nss3/secasn1.h +%{_includedir}/nss3/secasn1t.h +%{_includedir}/nss3/seccomon.h +%{_includedir}/nss3/secder.h +%{_includedir}/nss3/secdert.h +%{_includedir}/nss3/secdig.h +%{_includedir}/nss3/secdigt.h +%{_includedir}/nss3/secerr.h +%{_includedir}/nss3/secitem.h +%{_includedir}/nss3/secoid.h +%{_includedir}/nss3/secoidt.h +%{_includedir}/nss3/secport.h +%{_includedir}/nss3/utilrename.h + +%changelog +* Wed Sep 29 2010 jkeating - 3.12.8-2 +- Rebuilt for gcc bug 634757 + +* Thu Sep 23 2010 Elio Maldonado emaldona@redhat.com - 3.12.8-1 +- Update to 3.12.8 + +* Sat Sep 18 2010 Elio Maldonado emaldona@redhat.com - 3.12.7.99.4-1 +- NSS 3.12.8 RC0 + +* Sat Sep 04 2010 Elio Maldonado emaldona@redhat.com - 3.12.7.99.3-1 +- NSS 3.12.8 Beta 3 + +* Sat Aug 29 2010 Elio Maldonado emaldona@redhat.com - 3.12.7-2 +- Define NSS_USE_SYSTEM_SQLITE and remove nolocalsql patch + +* Mon Aug 16 2010 Elio Maldonado emaldona@redhat.com - 3.12.7-1 +- Update to 3.12.7 + +* Fri Mar 05 2010 Elio Maldonado emaldona@redhat.com - 3.12.6-1 +- Update to 3.12.6 + +* Mon Jan 18 2010 Elio Maldonado emaldona@redhat.com - 3.12.5-2 +- Fix in nss-util-config.in + +* Thu Dec 03 2009 Elio Maldonadoemaldona@redhat.com - 3.12.5-1 +- Update to 3.12.5 + +* Thu Sep 10 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-8 +- Retagging for a chained build with nss-softokn and nss + +* Thu Sep 10 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-5 +- Restoring -rpath-link to nss-util-config + +* Tue Sep 08 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-4 +- Installing shared libraries to %%{_libdir} + +* Sat Sep 05 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-3 +- Remove symbolic links to shared libraries from devel - 521155 +- Apply nss-nolocalsql patch subset for nss-util +- No rpath-link in nss-util-config + +* Fri Sep 04 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-2 +- Retagging for a chained build + +* Thu Sep 03 2009 Elio Maldonadoemaldona@redhat.com - 3.12.4-1 +- Update to 3.12.4 +- Don't require sqlite + +* Thu Aug 27 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-15 +- Bump the release number for a chained build of nss-util, nss-softokn and nss + +* Thu Aug 27 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-14 +- Cleanup nss-util-config.in + +* Thu Aug 27 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-13 +- nss-util-devel doesn't require nss-devel + +* Wed Aug 26 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-12 +- bump to unique nvr + +* Wed Aug 26 2009 Elio Maldonadoemaldona@redhat.com - 3.12.3.99.3-11 +- Remove spurious executable permissions from nss-util-config +- Shorten some descriptions to keep rpmlint happy + +* Mon Aug 24 2009 Dennis Gilmore dennis@ausil.us 3.12.3.99.3-10 +- dont include the headers in nss-util only in the -devel package +- nss-util-devel Requires nss-devel since its only providing a subset of the headers. + +* Thu Aug 20 2009 Dennis Gilmore dennis@ausil.us 3.12.3.99.3-9 +- Provide nss-devel since we obsolete it + +* Thu Aug 19 2009 Elio Maldonado emaldona@redhat.com 3.12.3.99.3-8.1 +- nss-util-devel obsoletes nss-devel < 3.12.3.99.3-8 + +* Thu Aug 19 2009 Elio Maldonado emaldona@redhat.com 3.12.3.99.3-8 +- Initial build diff --git a/pkgs/core/nss/PayPalEE.cert b/pkgs/core/nss/PayPalEE.cert new file mode 100644 index 0000000..e49d8bd Binary files /dev/null and b/pkgs/core/nss/PayPalEE.cert differ diff --git a/pkgs/core/nss/cert8.db b/pkgs/core/nss/cert8.db new file mode 100644 index 0000000..ac40a33 Binary files /dev/null and b/pkgs/core/nss/cert8.db differ diff --git a/pkgs/core/nss/cert9.db b/pkgs/core/nss/cert9.db new file mode 100644 index 0000000..1763264 Binary files /dev/null and b/pkgs/core/nss/cert9.db differ diff --git a/pkgs/core/nss/key3.db b/pkgs/core/nss/key3.db new file mode 100644 index 0000000..31e3975 Binary files /dev/null and b/pkgs/core/nss/key3.db differ diff --git a/pkgs/core/nss/key4.db b/pkgs/core/nss/key4.db new file mode 100644 index 0000000..6bd60cb Binary files /dev/null and b/pkgs/core/nss/key4.db differ diff --git a/pkgs/core/nss/nss-config.in b/pkgs/core/nss/nss-config.in new file mode 100644 index 0000000..f8f893e --- /dev/null +++ b/pkgs/core/nss/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <<EOF +Usage: nss-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--includedir[=DIR]] + [--libdir[=DIR]] + [--version] + [--libs] + [--cflags] +Dynamic Libraries: + nss + nssutil + ssl + smime +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&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/pkgs/core/nss/nss.nm b/pkgs/core/nss/nss.nm new file mode 100644 index 0000000..d1a9e34 --- /dev/null +++ b/pkgs/core/nss/nss.nm @@ -0,0 +1,225 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = nss +PKG_VER = 3.12.8 +PKG_REL = 3 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.mozilla.org/projects/security/pki/nss/ +PKG_LICENSE = MPLv1.1 or GPLv2+ or LGPLv2+ +PKG_SUMMARY = Network Security Services. + +PKG_BUILD_DEPS+= nspr-devel nss-softokn-devel nss-util-devel perl pkg-config \ + psmisc sqlite-devel zlib-devel + +define PKG_DESCRIPTION + Network Security Services (NSS) is a set of libraries designed to \ + support cross-platform development of security-enabled client and \ + server applications. Applications built with NSS can support SSL v2 \ + and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 \ + v3 certificates, and other security standards. +endef + +PKG_TARBALL = $(THISAPP)-stripped.tar.bz2 +PKG_OBJECTS += nss-pem-20100809.tar.bz2 + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-libs + +PKG_DEPS-$(PKG_NAME_REAL)-devel += nss nss-softokn-devel nss-util-devel + +# Mozilla does no versioning :( +define PKG_FILES-$(PKG_NAME_REAL)-devel + /usr/bin/*-config + /usr/include + /usr/lib/pkgconfig +endef + +define PKG_FILES-$(PKG_NAME_REAL)-libs + /usr/lib/*.so +endef + +# XXX -> need to be removed +define QUALITY_AGENT_WHITELIST_RPATH + $$ORIGIN/../lib +endef + +## Define some global environment variables + +export FREEBL_NO_DEPEND=1 + +# Enable compiler optimizations and disable debugging code +export BUILD_OPT=1 +export XCFLAGS=$(CFLAGS) + +export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 +export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 + +export NSPR_INCLUDE_DIR=/usr/include/nspr4 +export NSPR_LIB_DIR=/usr/lib + +export NSS_INCLUDE_DIR=/usr/include/nss3 +export NSS_LIB_DIR=/usr/lib + +export NSS_USE_SYSTEM_SQLITE=1 + +define STAGE_PREPARE + cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$(PKG_TARBALL) + cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/nss-pem-20100809.tar.bz2 + + $(DO_PATCHES) + + cp -vf $(DIR_SOURCE)/PayPalEE.cert \ + $(DIR_APP)/mozilla/security/nss/tests/libpkix/certs +endef + +define STAGE_BUILD + cd $(DIR_APP) && make -C ./mozilla/security/coreconf + cd $(DIR_APP) && make -C ./mozilla/security/dbm + cd $(DIR_APP) && make -C ./mozilla/security/nss +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/usr/include/nss3 + -mkdir -pv $(BUILDROOT)/usr/{bin,lib} + -mkdir -pv $(BUILDROOT)/usr/lib/pkgconfig + -mkdir -pv $(BUILDROOT)/usr/lib/nss/unsupported-tools + + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnss3.so \ + $(BUILDROOT)/usr/lib + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnssckbi.so \ + $(BUILDROOT)/usr/lib + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnsspem.so \ + $(BUILDROOT)/usr/lib + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libnsssysinit.so \ + $(BUILDROOT)/usr/lib + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libsmime3.so \ + $(BUILDROOT)/usr/lib + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/lib/libssl3.so \ + $(BUILDROOT)/usr/lib + + # Install the empty NSS db files + -mkdir -pv $(BUILDROOT)/etc/pki/nssdb + cp -vf $(DIR_SOURCE)/*.db $(BUILDROOT)/etc/pki/nssdb/ + install -p -v -m 644 $(DIR_SOURCE)/system-pkcs11.txt \ + $(BUILDROOT)/etc/pki/nssdb/pkcs11.txt + + # Copy the binaries we want + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/certutil $(BUILDROOT)/usr/bin + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/cmsutil $(BUILDROOT)/usr/bin + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/crlutil $(BUILDROOT)/usr/bin + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/modutil $(BUILDROOT)/usr/bin + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/pk12util $(BUILDROOT)/usr/bin + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/signtool $(BUILDROOT)/usr/bin + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/signver $(BUILDROOT)/usr/bin + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/ssltap $(BUILDROOT)/usr/bin + + # Copy the binaries we ship as unsupported + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/atob $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/btoa $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/derdump $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/ocspclnt $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/pp $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/selfserv $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/strsclnt $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/symkeyutil $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/tstclnt $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/vfyserv $(BUILDROOT)/usr/lib/nss/unsupported-tools + install -p -v -m 755 $(DIR_APP)/mozilla/dist/*.OBJ/bin/vfychain $(BUILDROOT)/usr/lib/nss/unsupported-tools + + sed -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr,g" \ + -e "s,@exec_prefix@,/usr,g" \ + -e "s,@includedir@,/usr/include/nss3,g" \ + -e "s,@MOD_MAJOR_VERSION@,$$(grep "#define.*NSS_VMAJOR" $(DIR_APP)/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + -e "s,@MOD_MINOR_VERSION@,$$(grep "#define.*NSS_VMINOR" $(DIR_APP)/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + -e "s,@MOD_PATCH_VERSION@,$$(grep "#define.*NSS_VPATCH" $(DIR_APP)/mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ + < $(DIR_SOURCE)/nss-config.in \ + > $(BUILDROOT)/usr/bin/nss-config + chmod -v 755 $(BUILDROOT)/usr/bin/nss-config + + install -p -v -m 755 $(DIR_SOURCE)/setup-nsssysinit.sh $(BUILDROOT)/usr/bin + + # Set up our package file + # The nspr_version and nss_{util|softokn}_version globals used + # here match the ones nss has for its Requires. + + # XXX need to fix this + sed \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr,g" \ + -e "s,%includedir%,/usr/include/nss3,g" \ + -e "s,%NSS_VERSION%,$(PKG_VER),g" \ + -e "s,%NSPR_VERSION%,$$(nspr-config --version),g" \ + -e "s,%NSSUTIL_VERSION%,$$(nss-util-config --version),g" \ + -e "s,%SOFTOKEN_VERSION%,$$(nss-softokn-config --version),g" \ + < $(DIR_SOURCE)/nss.pc.in \ + > $(BUILDROOT)/usr/lib/pkgconfig/nss.pc + + # Copy the include files we want + cp -vf $(DIR_APP)/mozilla/dist/public/nss/*.h $(BUILDROOT)/usr/include/nss3 + chmod -v 644 $(BUILDROOT)/usr/include/nss3/*.h + + # remove the nss-util-devel headers + cd $(BUILDROOT)/usr/include/nss3 && rm -vf \ + base64.h \ + ciferfam.h \ + nssb64.h \ + nssb64t.h \ + nsslocks.h \ + nssilock.h \ + nssilckt.h \ + nssrwlk.h \ + nssrwlkt.h \ + nssutil.h \ + pkcs11{,f,n,p,t,u}.h \ + portreg.h \ + secasn1.h \ + secasn1t.h \ + seccomon.h \ + secder.h \ + secdert.h \ + secdig.h \ + secdigt.h \ + secerr.h \ + secitem.h \ + secoid.h \ + secoidt.h \ + secport.h \ + utilrename.h + + # remove header shipped in nss-softokn-devel + cd $(BUILDROOT)/usr/include/nss3 && rm -vf \ + blapit.h \ + ecl-exp.h \ + hasht.h \ + sechash.h \ + secmodt.h \ + shsign.h \ + nsslowhash.h +endef diff --git a/pkgs/core/nss/nss.pc.in b/pkgs/core/nss/nss.pc.in new file mode 100644 index 0000000..d23d15a --- /dev/null +++ b/pkgs/core/nss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION%, nss-util >= %NSSUTIL_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 +Cflags: -I${includedir} diff --git a/pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch b/pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch new file mode 100644 index 0000000..108bb9a --- /dev/null +++ b/pkgs/core/nss/patches/0001-Add-support-for-PKCS-8-encoded-private-keys.patch @@ -0,0 +1,237 @@ +From 8bd0a0427e034262ff982fed98ca5e8c623165db Mon Sep 17 00:00:00 2001 +From: Rich Megginson rmeggins@redhat.com +Date: Mon, 12 Jul 2010 16:31:01 -0600 +Subject: [PATCH] Add support for PKCS#8 encoded private keys + +The code supports PKCS#1 encoded RSA private keys that begin with the +BEGIN RSA PRIVATE KEY header in PEM files. This patch adds support for +RSA private keys encoded in PEM files that begin with the header +BEGIN PRIVATE KEY which are in PKCS#8 format. +--- + prsa.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++------------------ + util.c | 3 +- + 2 files changed, 110 insertions(+), 43 deletions(-) + +diff --git a/prsa.c b/prsa.c +index 5b2f379..8d4fb92 100644 +--- a/mozilla/security/nss/lib/ckfw/pem/prsa.c ++++ b/mozilla/security/nss/lib/ckfw/pem/prsa.c +@@ -63,6 +63,35 @@ const SEC_ASN1Template pem_RSAPrivateKeyTemplate[] = { + {0} + }; + ++static const SEC_ASN1Template pem_AttributeTemplate[] = { ++ { SEC_ASN1_SEQUENCE, ++ 0, NULL, sizeof(NSSLOWKEYAttribute) }, ++ { SEC_ASN1_OBJECT_ID, offsetof(NSSLOWKEYAttribute, attrType) }, ++ { SEC_ASN1_SET_OF | SEC_ASN1_XTRN, offsetof(NSSLOWKEYAttribute, attrValue), ++ SEC_ASN1_SUB(SEC_AnyTemplate) }, ++ { 0 } ++}; ++ ++static const SEC_ASN1Template pem_SetOfAttributeTemplate[] = { ++ { SEC_ASN1_SET_OF, 0, pem_AttributeTemplate }, ++}; ++ ++const SEC_ASN1Template pem_PrivateKeyInfoTemplate[] = { ++ { SEC_ASN1_SEQUENCE, ++ 0, NULL, sizeof(NSSLOWKEYPrivateKeyInfo) }, ++ { SEC_ASN1_INTEGER, ++ offsetof(NSSLOWKEYPrivateKeyInfo,version) }, ++ { SEC_ASN1_INLINE | SEC_ASN1_XTRN, ++ offsetof(NSSLOWKEYPrivateKeyInfo,algorithm), ++ SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) }, ++ { SEC_ASN1_OCTET_STRING, ++ offsetof(NSSLOWKEYPrivateKeyInfo,privateKey) }, ++ { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 0, ++ offsetof(NSSLOWKEYPrivateKeyInfo, attributes), ++ pem_SetOfAttributeTemplate }, ++ { 0 } ++}; ++ + /* Declarations */ + SECStatus pem_RSA_Sign(pemLOWKEYPrivateKey * key, unsigned char *output, + unsigned int *outputLen, unsigned int maxOutputLen, +@@ -116,6 +145,79 @@ pem_DestroyPrivateKey(pemLOWKEYPrivateKey * privk) + nss_ZFreeIf(privk); + } + ++/* decode and parse the rawkey into the lpk structure */ ++static pemLOWKEYPrivateKey * ++pem_getPrivateKey(PLArenaPool *arena, SECItem *rawkey, CK_RV * pError, NSSItem *modulus) ++{ ++ pemLOWKEYPrivateKey *lpk = NULL; ++ SECStatus rv = SECFailure; ++ NSSLOWKEYPrivateKeyInfo *pki = NULL; ++ SECItem *keysrc = NULL; ++ ++ /* make sure SECOID is initialized - not sure why we have to do this outside of nss_Init */ ++ if (SECSuccess != (rv = SECOID_Init())) { ++ *pError = CKR_GENERAL_ERROR; ++ return NULL; /* wha???? */ ++ } ++ ++ pki = (NSSLOWKEYPrivateKeyInfo*)PORT_ArenaZAlloc(arena, ++ sizeof(NSSLOWKEYPrivateKeyInfo)); ++ if(!pki) { ++ *pError = CKR_HOST_MEMORY; ++ goto done; ++ } ++ ++ /* let's first see if this is a "raw" RSA private key or an RSA private key in PKCS#8 format */ ++ rv = SEC_ASN1DecodeItem(arena, pki, pem_PrivateKeyInfoTemplate, rawkey); ++ if (rv != SECSuccess) { ++ /* not PKCS#8 - assume it's a "raw" RSA private key */ ++ keysrc = rawkey; ++ } else if (SECOID_GetAlgorithmTag(&pki->algorithm) == SEC_OID_PKCS1_RSA_ENCRYPTION) { ++ keysrc = &pki->privateKey; ++ } else { /* unsupported */ ++ *pError = CKR_FUNCTION_NOT_SUPPORTED; ++ goto done; ++ } ++ ++ lpk = (pemLOWKEYPrivateKey *) nss_ZAlloc(NULL, ++ sizeof(pemLOWKEYPrivateKey)); ++ if (lpk == NULL) { ++ *pError = CKR_HOST_MEMORY; ++ goto done; ++ } ++ ++ lpk->arena = arena; ++ lpk->keyType = pemLOWKEYRSAKey; ++ prepare_low_rsa_priv_key_for_asn1(lpk); ++ ++ /* I don't know what this is supposed to accomplish. We free the old ++ modulus data and set it again, making a copy of the new data. ++ But we just allocated a new empty key structure above with ++ nss_ZAlloc. So lpk->u.rsa.modulus.data is NULL and ++ lpk->u.rsa.modulus.len. If the intention is to free the old ++ modulus data, why not just set it to NULL after freeing? Why ++ go through this unnecessary and confusing copying code? ++ */ ++ if (modulus) { ++ nss_ZFreeIf(modulus->data); ++ modulus->data = (void *) nss_ZAlloc(NULL, lpk->u.rsa.modulus.len); ++ modulus->size = lpk->u.rsa.modulus.len; ++ nsslibc_memcpy(modulus->data, lpk->u.rsa.modulus.data, ++ lpk->u.rsa.modulus.len); ++ } ++ ++ /* decode the private key and any algorithm parameters */ ++ rv = SEC_QuickDERDecodeItem(arena, lpk, pem_RSAPrivateKeyTemplate, ++ keysrc); ++ ++ if (rv != SECSuccess) { ++ goto done; ++ } ++ ++done: ++ return lpk; ++} ++ + void + pem_PopulateModulusExponent(pemInternalObject * io) + { +@@ -123,7 +225,7 @@ pem_PopulateModulusExponent(pemInternalObject * io) + const NSSItem *keyType = pem_FetchAttribute(io, CKA_KEY_TYPE); + pemLOWKEYPrivateKey *lpk = NULL; + PLArenaPool *arena; +- SECStatus rv; ++ CK_RV pError = 0; + + /* make sure we have the right objects */ + if (((const NSSItem *) NULL == classItem) || +@@ -140,26 +242,12 @@ pem_PopulateModulusExponent(pemInternalObject * io) + return; + } + +- lpk = (pemLOWKEYPrivateKey *) nss_ZAlloc(NULL, +- sizeof(pemLOWKEYPrivateKey)); ++ lpk = pem_getPrivateKey(arena, io->u.key.key.privateKey, &pError, NULL); + if (lpk == NULL) { + PORT_FreeArena(arena, PR_FALSE); + return; + } + +- lpk->arena = arena; +- lpk->keyType = pemLOWKEYRSAKey; +- prepare_low_rsa_priv_key_for_asn1(lpk); +- +- /* decode the private key and any algorithm parameters */ +- rv = SEC_QuickDERDecodeItem(arena, lpk, pem_RSAPrivateKeyTemplate, +- io->u.key.key.privateKey); +- +- if (rv != SECSuccess) { +- PORT_FreeArena(arena, PR_FALSE); +- return; +- } +- + nss_ZFreeIf(io->u.key.key.modulus.data); + io->u.key.key.modulus.data = + (void *) nss_ZAlloc(NULL, lpk->u.rsa.modulus.len); +@@ -252,13 +340,6 @@ pem_mdCryptoOperationRSAPriv_Create + pemInternalCryptoOperationRSAPriv *iOperation; + pemLOWKEYPrivateKey *lpk = NULL; + PLArenaPool *arena; +- SECStatus rv; +- +- arena = PORT_NewArena(2048); +- if (!arena) { +- *pError = CKR_HOST_MEMORY; +- return (NSSCKMDCryptoOperation *) NULL; +- } + + /* make sure we have the right objects */ + if (((const NSSItem *) NULL == classItem) || +@@ -271,30 +352,15 @@ pem_mdCryptoOperationRSAPriv_Create + return (NSSCKMDCryptoOperation *) NULL; + } + +- lpk = (pemLOWKEYPrivateKey *) nss_ZAlloc(NULL, +- sizeof (pemLOWKEYPrivateKey)); +- if (lpk == NULL) { ++ arena = PORT_NewArena(2048); ++ if (!arena) { + *pError = CKR_HOST_MEMORY; + return (NSSCKMDCryptoOperation *) NULL; + } +- lpk->arena = arena; +- lpk->keyType = pemLOWKEYRSAKey; +- prepare_low_rsa_priv_key_for_asn1(lpk); + +- nss_ZFreeIf(iKey->u.key.key.modulus.data); +- iKey->u.key.key.modulus.data = +- (void *) nss_ZAlloc(NULL, lpk->u.rsa.modulus.len); +- iKey->u.key.key.modulus.size = lpk->u.rsa.modulus.len; +- nsslibc_memcpy(iKey->u.key.key.modulus.data, lpk->u.rsa.modulus.data, +- lpk->u.rsa.modulus.len); +- +- /* decode the private key and any algorithm parameters */ +- rv = SEC_QuickDERDecodeItem(arena, lpk, pem_RSAPrivateKeyTemplate, +- iKey->u.key.key.privateKey); +- +- if (rv != SECSuccess) { ++ lpk = pem_getPrivateKey(arena, iKey->u.key.key.privateKey, pError, &iKey->u.key.key.modulus); ++ if (lpk == NULL) { + PORT_FreeArena(arena, PR_FALSE); +- *pError = CKR_HOST_MEMORY; + return (NSSCKMDCryptoOperation *) NULL; + } + +diff --git a/util.c b/util.c +index a6ca094..d02ee87 100644 +--- a/mozilla/security/nss/lib/ckfw/pem/util.c ++++ b/mozilla/security/nss/lib/ckfw/pem/util.c +@@ -164,7 +164,8 @@ ReadDERFromFile(SECItem *** derlist, char *filename, PRBool ascii, + int key = 0; + while ((asc) && ((body = strstr(asc, "-----BEGIN")) != NULL)) { + key = 0; +- if (strncmp(body, "-----BEGIN RSA PRIVATE KEY", 25) == 0) { ++ if ((strncmp(body, "-----BEGIN RSA PRIVATE KEY", 25) == 0) || ++ (strncmp(body, "-----BEGIN PRIVATE KEY", 21) == 0)) { + key = 1; + c = body; + body = strchr(body, '\n'); +-- +1.5.5.6 + diff --git a/pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch b/pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch new file mode 100644 index 0000000..23eb47d --- /dev/null +++ b/pkgs/core/nss/patches/0001-Do-not-define-SEC_SkipTemplate.patch @@ -0,0 +1,35 @@ +From 9b7334b61cf3277e5eb48b716f6719b4636e2572 Mon Sep 17 00:00:00 2001 +From: Rich Megginson rmeggins@redhat.com +Date: Mon, 12 Jul 2010 17:21:01 -0600 +Subject: [PATCH] Do not define SEC_SkipTemplate + +Building NSS with PEM support gives an error in pbobject due to multiple +definitions of SEC_SkipTemplate. This is already defined in libnssutil +--- + pobject.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/pobject.c b/pobject.c +index 81b9028..48f5e78 100644 +--- a/mozilla/security/nss/lib/ckfw/pem/pobject.c ++++ b/mozilla/security/nss/lib/ckfw/pem/pobject.c +@@ -172,6 +172,8 @@ static const NSSItem pem_trusted = { + (void *) &ckt_netscape_trusted, (PRUint32) sizeof(CK_TRUST) + }; + ++/* SEC_SkipTemplate is already defined and exported by libnssutil */ ++#ifdef SEC_SKIP_TEMPLATE + /* + * Template for skipping a subitem. + * +@@ -182,6 +184,7 @@ static const NSSItem pem_trusted = { + const SEC_ASN1Template SEC_SkipTemplate[] = { + {SEC_ASN1_SKIP} + }; ++#endif + + /* + * Find the subjectName in a DER encoded certificate +-- +1.5.5.6 + diff --git a/pkgs/core/nss/patches/nss-enable-pem.patch b/pkgs/core/nss/patches/nss-enable-pem.patch new file mode 100644 index 0000000..a84907c --- /dev/null +++ b/pkgs/core/nss/patches/nss-enable-pem.patch @@ -0,0 +1,12 @@ +diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem ./mozilla/security/nss/lib/ckfw/manifest.mn +--- a/mozilla/security/nss/lib/ckfw/manifest.mn.prepem 2008-08-05 16:34:23.000000000 -0700 ++++ b/mozilla/security/nss/lib/ckfw/manifest.mn 2008-08-05 16:34:30.000000000 -0700 +@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife + + CORE_DEPTH = ../../.. + +-DIRS = builtins ++DIRS = builtins pem + + PRIVATE_EXPORTS = \ + ck.h \ diff --git a/pkgs/core/nss/patches/nss-sysinit-userdb-first.patch b/pkgs/core/nss/patches/nss-sysinit-userdb-first.patch new file mode 100755 index 0000000..cbfbb9a --- /dev/null +++ b/pkgs/core/nss/patches/nss-sysinit-userdb-first.patch @@ -0,0 +1,65 @@ +diff -up ./mozilla/security/nss/lib/sysinit/nsssysinit.c.orig ./mozilla/security/nss/lib/sysinit/nsssysinit.c +--- ./mozilla/security/nss/lib/sysinit/nsssysinit.c.orig 2010-06-17 09:17:30.732643399 -0700 ++++ ./mozilla/security/nss/lib/sysinit/nsssysinit.c 2010-06-17 09:20:22.691642397 -0700 +@@ -263,9 +263,18 @@ get_list(char *filename, char *stripped_ + sysdb = getSystemDB(); + userdb = getUserDB(); + +- /* Don't open root's user DB */ ++ /* return a list of databases to open. First the system database. */ ++ if (sysdb) { ++ const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly"; ++ module_list[next++] = PR_smprintf( ++ "library= " ++ "module="NSS system database" " ++ "parameters="configdir='sql:%s' tokenDescription='NSS system database' %s" " ++ "NSS="%sflags=internal,critical"",sysdb, readonly, nssflags); ++ } ++ ++ /* Next the user database, but not for root. */ + if (userdb != NULL && !userIsRoot()) { +- /* return a list of databases to open. First the user Database */ + module_list[next++] = PR_smprintf( + "library= " + "module="NSS User database" " +@@ -284,40 +293,6 @@ get_list(char *filename, char *stripped_ + userdb, stripped_parameters); + } + +-#if 0 +- /* This doesn't actually work. If we register +- both this and the sysdb (in either order) +- then only one of them actually shows up */ +- +- /* Using a NULL filename as a Boolean flag to +- * prevent registering both an application-defined +- * db and the system db. rhbz #546211. +- */ +- PORT_Assert(filename); +- if (sysdb && PL_CompareStrings(filename, sysdb)) +- filename = NULL; +- else if (userdb && PL_CompareStrings(filename, userdb)) +- filename = NULL; +- +- if (filename && !userIsRoot()) { +- module_list[next++] = PR_smprintf( +- "library= " +- "module="NSS database" " +- "parameters="configdir='sql:%s' tokenDescription='NSS database sql:%s'" " +- "NSS="%sflags=internal"",filename, filename, nssflags); +- } +-#endif +- +- /* now the system database (always read only unless it's root) */ +- if (sysdb) { +- const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly"; +- module_list[next++] = PR_smprintf( +- "library= " +- "module="NSS system database" " +- "parameters="configdir='sql:%s' tokenDescription='NSS system database' %s" " +- "NSS="%sflags=internal,critical"",sysdb, readonly, nssflags); +- } +- + /* that was the last module */ + module_list[next] = 0; + diff --git a/pkgs/core/nss/patches/nsspem-596674.patch b/pkgs/core/nss/patches/nsspem-596674.patch new file mode 100644 index 0000000..cfa44e6 --- /dev/null +++ b/pkgs/core/nss/patches/nsspem-596674.patch @@ -0,0 +1,127 @@ +diff -up a/mozilla/security/nss/lib/ckfw/pem/pinst.c.596783 b/mozilla/security/nss/lib/ckfw/pem/pinst.c +--- a/mozilla/security/nss/lib/ckfw/pem/pinst.c.596783 2010-06-06 18:27:27.256318318 -0700 ++++ b/mozilla/security/nss/lib/ckfw/pem/pinst.c 2010-06-06 20:45:28.158442982 -0700 +@@ -151,7 +151,7 @@ GetCertFields(unsigned char *cert, int c + buf = issuer->data + issuer->len; + + /* only wanted issuer/SN */ +- if (valid == NULL) { ++ if (subject == NULL || valid == NULL || subjkey == NULL) { + return SECSuccess; + } + /* validity */ +@@ -219,53 +219,93 @@ CreateObject(CK_OBJECT_CLASS objClass, + memset(&o->u.trust, 0, sizeof(o->u.trust)); + break; + } ++ ++ o->nickname = (char *) nss_ZAlloc(NULL, strlen(nickname) + 1); ++ if (o->nickname == NULL) ++ goto fail; ++ strcpy(o->nickname, nickname); ++ ++ sprintf(id, "%d", objid); ++ len = strlen(id) + 1; /* zero terminate */ ++ o->id.data = (void *) nss_ZAlloc(NULL, len); ++ if (o->id.data == NULL) ++ goto fail; ++ (void) nsslibc_memcpy(o->id.data, id, len); ++ o->id.size = len; ++ + o->objClass = objClass; + o->type = type; + o->slotID = slotID; ++ + o->derCert = nss_ZNEW(NULL, SECItem); ++ if (o->derCert == NULL) ++ goto fail; + o->derCert->data = (void *) nss_ZAlloc(NULL, certDER->len); ++ if (o->derCert->data == NULL) ++ goto fail; + o->derCert->len = certDER->len; + nsslibc_memcpy(o->derCert->data, certDER->data, certDER->len); + + switch (objClass) { + case CKO_CERTIFICATE: + case CKO_NETSCAPE_TRUST: +- GetCertFields(o->derCert->data, +- o->derCert->len, &issuer, &serial, +- &derSN, &subject, &valid, &subjkey); ++ if (SECSuccess != GetCertFields(o->derCert->data, o->derCert->len, ++ &issuer, &serial, &derSN, &subject, ++ &valid, &subjkey)) ++ goto fail; + + o->u.cert.subject.data = (void *) nss_ZAlloc(NULL, subject.len); ++ if (o->u.cert.subject.data == NULL) ++ goto fail; + o->u.cert.subject.size = subject.len; + nsslibc_memcpy(o->u.cert.subject.data, subject.data, subject.len); + + o->u.cert.issuer.data = (void *) nss_ZAlloc(NULL, issuer.len); ++ if (o->u.cert.issuer.data == NULL) { ++ nss_ZFreeIf(o->u.cert.subject.data); ++ goto fail; ++ } + o->u.cert.issuer.size = issuer.len; + nsslibc_memcpy(o->u.cert.issuer.data, issuer.data, issuer.len); + + o->u.cert.serial.data = (void *) nss_ZAlloc(NULL, serial.len); ++ if (o->u.cert.serial.data == NULL) { ++ nss_ZFreeIf(o->u.cert.issuer.data); ++ nss_ZFreeIf(o->u.cert.subject.data); ++ goto fail; ++ } + o->u.cert.serial.size = serial.len; + nsslibc_memcpy(o->u.cert.serial.data, serial.data, serial.len); + break; + case CKO_PRIVATE_KEY: + o->u.key.key.privateKey = nss_ZNEW(NULL, SECItem); ++ if (o->u.key.key.privateKey == NULL) ++ goto fail; + o->u.key.key.privateKey->data = + (void *) nss_ZAlloc(NULL, keyDER->len); ++ if (o->u.key.key.privateKey->data == NULL) { ++ nss_ZFreeIf(o->u.key.key.privateKey); ++ goto fail; ++ } + o->u.key.key.privateKey->len = keyDER->len; + nsslibc_memcpy(o->u.key.key.privateKey->data, keyDER->data, + keyDER->len); + } + +- o->nickname = (char *) nss_ZAlloc(NULL, strlen(nickname) + 1); +- strcpy(o->nickname, nickname); +- +- sprintf(id, "%d", objid); +- +- len = strlen(id) + 1; /* zero terminate */ +- o->id.data = (void *) nss_ZAlloc(NULL, len); +- (void) nsslibc_memcpy(o->id.data, id, len); +- o->id.size = len; + + return o; ++ ++fail: ++ if (o) { ++ if (o->derCert) { ++ nss_ZFreeIf(o->derCert->data); ++ nss_ZFreeIf(o->derCert); ++ } ++ nss_ZFreeIf(o->id.data); ++ nss_ZFreeIf(o->nickname); ++ nss_ZFreeIf(o); ++ } ++ return NULL; + } + + pemInternalObject * +@@ -306,6 +346,8 @@ AddObjectIfNeeded(CK_OBJECT_CLASS objCla + /* object not found, we need to create it */ + pemInternalObject *io = CreateObject(objClass, type, certDER, keyDER, + filename, objid, slotID); ++ if (io == NULL) ++ return NULL; + + io->gobjIndex = count; + diff --git a/pkgs/core/nss/patches/renegotiate-transitional.patch b/pkgs/core/nss/patches/renegotiate-transitional.patch new file mode 100644 index 0000000..0cd6556 --- /dev/null +++ b/pkgs/core/nss/patches/renegotiate-transitional.patch @@ -0,0 +1,12 @@ +diff -up ./mozilla/security/nss/lib/ssl/sslsock.c.transitional ./mozilla/security/nss/lib/ssl/sslsock.c +--- a/mozilla/security/nss/lib/ssl/sslsock.c.transitional 2010-09-04 09:46:50.331327676 -0700 ++++ b/mozilla/security/nss/lib/ssl/sslsock.c 2010-09-04 09:50:02.814325605 -0700 +@@ -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 */ + PR_FALSE, /* enableFalseStart */ + }; diff --git a/pkgs/core/nss/secmod.db b/pkgs/core/nss/secmod.db new file mode 100644 index 0000000..9a02807 Binary files /dev/null and b/pkgs/core/nss/secmod.db differ diff --git a/pkgs/core/nss/setup-nsssysinit.sh b/pkgs/core/nss/setup-nsssysinit.sh new file mode 100755 index 0000000..8e1f5f7 --- /dev/null +++ b/pkgs/core/nss/setup-nsssysinit.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# +# Turns on or off the nss-sysinit module db by editing the +# global PKCS #11 congiguration file. Displays the status. +# +# This script can be invoked by the user as super user. +# It is invoked at nss-sysinit post install time with argument on. +# +usage() +{ + cat <<EOF +Usage: setup-nsssysinit [on|off] + on - turns on nsssysinit + off - turns off nsssysinit + status - reports whether nsssysinit is turned on or off +EOF + exit $1 +} + +# validate +if [ $# -eq 0 ]; then + usage 1 1>&2 +fi + +# the system-wide configuration file +p11conf="/etc/pki/nssdb/pkcs11.txt" +# must exist, otherwise report it and exit with failure +if [ ! -f $p11conf ]; then + echo "Could not find ${p11conf}" + exit 1 +fi + +# check if nsssysinit is currently enabled or disabled +sysinit_enabled() +{ + grep -q '^library=libnsssysinit' ${p11conf} +} + +umask 022 +case "$1" in + on | ON ) + if sysinit_enabled; then + exit 0 + fi + cat ${p11conf} | \ + sed -e 's/^library=$/library=libnsssysinit.so/' \ + -e '/^NSS/s/(Flags=internal)(,[^m])/\1,moduleDBOnly\2/' > \ + ${p11conf}.on + mv ${p11conf}.on ${p11conf} + ;; + off | OFF ) + if ! sysinit_enabled; then + exit 0 + fi + cat ${p11conf} | \ + sed -e 's/^library=libnsssysinit.so/library=/' \ + -e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \ + ${p11conf}.off + mv ${p11conf}.off ${p11conf} + ;; + status ) + echo -n 'NSS sysinit is ' + sysinit_enabled && echo 'enabled' || echo 'disabled' + ;; + * ) + usage 1 1>&2 + ;; +esac diff --git a/pkgs/core/nss/system-pkcs11.txt b/pkgs/core/nss/system-pkcs11.txt new file mode 100644 index 0000000..c2f5704 --- /dev/null +++ b/pkgs/core/nss/system-pkcs11.txt @@ -0,0 +1,5 @@ +library=libnsssysinit.so +name=NSS Internal PKCS #11 Module +parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' +NSS=Flags=internal,moduleDBOnly,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) + diff --git a/pkgs/core/pciutils/pciutils.nm b/pkgs/core/pciutils/pciutils.nm index 80d5ae7..6f4be47 100644 --- a/pkgs/core/pciutils/pciutils.nm +++ b/pkgs/core/pciutils/pciutils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = pciutils PKG_VER = 3.1.7 -PKG_REL = 0 +PKG_REL = 1

PKG_MAINTAINER = PKG_GROUP = System/Base @@ -44,12 +44,13 @@ PKG_TARBALL = $(THISAPP).tar.bz2 PKG_PACKAGES += $(PKG_NAME)-devel $(PKG_NAME)-libs

define STAGE_BUILD - cd $(DIR_APP) && make SHARED=yes OPT="$(CFLAGS)" PREFIX=/usr ZLIB=no $(PARALLELISMFLAGS) + cd $(DIR_APP) && make SHARED=yes OPT="$(CFLAGS)" PREFIX=/usr \ + IDSDIR=/usr/share/hwdata ZLIB=no $(PARALLELISMFLAGS) endef

define STAGE_INSTALL cd $(DIR_APP) && make SHARED=yes PREFIX=/usr install DESTDIR=$(BUILDROOT) \ - MANDIR=/usr/share/man + IDSDIR=/usr/share/hwdata MANDIR=/usr/share/man

-mkdir -pv $(BUILDROOT)/usr/include/pci install -v -m 644 $(DIR_APP)/lib/*.h $(BUILDROOT)/usr/include/pci diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/core/util-linux-ng/util-linux-ng.nm index efb421d..85a6486 100644 --- a/pkgs/core/util-linux-ng/util-linux-ng.nm +++ b/pkgs/core/util-linux-ng/util-linux-ng.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include

PKG_NAME = util-linux-ng -PKG_VER = 2.17.2 +PKG_VER = 2.18 PKG_REL = 0

PKG_MAINTAINER = @@ -43,7 +43,7 @@ define PKG_DESCRIPTION program. endef

-PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.gz

PKG_PACKAGES += $(PKG_NAME)-devel

hooks/post-receive -- IPFire 3.x development tree