+++ /dev/null
-# ChangeLog for dev-games/gigi
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 05 May 2012; Mike Gilbert <floppym@gentoo.org> gigi-0.8.0_pre1074.ebuild:
- Use pkgconfig virtual.
-
-*gigi-0.8.0_pre1074 (23 Apr 2012)
-
- 23 Apr 2012; hasufell <julian.ospald@googlemail.com>
- +gigi-0.8.0_pre1074.ebuild, +files/gigi-0.8.0_pre1074-devil.patch,
- +files/gigi-0.8.0_pre1074-docdir.patch,
- +files/gigi-0.8.0_pre1074-libtool.patch, +metadata.xml:
- New Ebuild for bug 349367 thanks to all
-
+++ /dev/null
-AUX gigi-0.8.0_pre1074-devil.patch 582 RMD160 6fc612643fee6574c37cd7d512f847b2b03895f5 SHA1 bee591cf24da4040c6952ba2ba4e06070375a2f6 SHA256 c01b3ea268c7406dfdea59bda69e2344e0b2add156ab92599c1bbf00721dad41
-AUX gigi-0.8.0_pre1074-docdir.patch 469 RMD160 6ef08b1682561501f18064409b829ddef796193a SHA1 22d8704e8e8587ed622f8da5465db54260a55ecf SHA256 d1d6e79f5e59131081850be8a174ccf342e36eef7b36ca671f5d011249710c4e
-AUX gigi-0.8.0_pre1074-libtool.patch 3086 RMD160 ceb8f724f41615c527f984ce8c2d5ef9669cffed SHA1 8e3b51762927d2d82f1122f5a166b3109023b80c SHA256 61205615f6b4330b8afcd94477f83ef8b9290302fc3b961a44db4b37feb5f86b
-EBUILD gigi-0.8.0_pre1074.ebuild 2270 RMD160 0f57161625b03055a9ee6c9808ff7314b8709f72 SHA1 efa533e468ae178bb1e22faed45e461d37a82c9c SHA256 39efb0fdd1239aeea59235e06718bd66d3b57de3d83752c172550f3ff06cc6df
-MISC ChangeLog 519 RMD160 496ba7eb1bcb59510e596bddb9a7e406d33bb353 SHA1 545255aeff4ce430dd4871ea783611ee86d7ebe0 SHA256 e2fff61d68cc4a6f7d1bfe485bac9c87e2f8c1b3ce76ac5b151a1fe4741eb15d
-MISC metadata.xml 492 RMD160 83ce68de26386f7f8d688be95c688301fcc78486 SHA1 8a9df3aa10107e398b354714b65e83a3d9c61fcf SHA256 29e8616a7da0d0a1fc06ab827d5af181d259687e0a822f007473de1898fdceee
+++ /dev/null
-From: hasufell <julian.ospald@googlemail.com>
-Date: Sun Apr 22 23:43:33 UTC 2012
-
-fix devil library variables
-
-!! applied on top of libtool.patch !!
-
---- GG/src/CMakeLists.txt
-+++ GG/src/CMakeLists.txt
-@@ -176,7 +176,7 @@
-
- set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBTOOL_LIB})
- if (USE_DEVIL)
-- list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
-+ list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARIES} ${ILU_LIBRARIES} ${ILUT_LIBRARIES})
- else ()
- if (JPEG_FOUND)
- list(APPEND THIS_LIB_LINK_LIBS ${JPEG_LIBRARIES})
+++ /dev/null
-From: hasufell <julian.ospald@googlemail.com>
-Date: Thu Apr 19 19:26:44 UTC 2012
-
-fixed hardcoded DOCDIR
-
---- GG/CMakeLists.txt
-+++ GG/CMakeLists.txt
-@@ -332,8 +332,8 @@
- endif ()
- if (BUILD_DOCUMENTATION AND NOT NO_DOCS_PACKAGE)
- install(
-- DIRECTORY ${CMAKE_BINARY_DIR}/doc/GG
-- DESTINATION doc
-+ DIRECTORY ${CMAKE_BINARY_DIR}/doc/GG/
-+ DESTINATION ${DOCDIR}
- )
- endif ()
- elseif (BUILD_DOCUMENTATION)
+++ /dev/null
-From: hasufell <julian.ospald@googlemail.com>
-Date: Sun Apr 22 23:09:06 UTC 2012
-
-use system ltdl header and link against libltdl
-
---- GG/CMakeLists.txt
-+++ GG/CMakeLists.txt
-@@ -228,36 +228,6 @@
- ########################################
- # Header Generation #
- ########################################
--if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
-- if (UNIX)
-- message("-- Configuring libltdl using \"libltdl/configure\" ...")
-- execute_process(
-- COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
-- WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
-- OUTPUT_QUIET
-- )
-- else ()
-- file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
-- "/* WARNING: Generated by GG's build system. All local changes will be lost! */
--#define error_t int
--#define HAVE_STDIO_H 1
--#define HAVE_STDLIB_H 1
--#define HAVE_STRING_H 1
--#define HAVE_CTYPE_H 1
--#define HAVE_MEMORY_H 1
--#define HAVE_ERRNO_H 1
--#define __WIN32__
--#define HAVE_MEMCPY 1
--#define HAVE_MEMMOVE 1
--#define LTDL_OBJDIR \".libs\"
--#define LTDL_DLOPEN_DEPLIBS 1
--#define LTDL_SHLIBPATH_VAR \"PATH\"
--#define LTDL_SHLIB_EXT \".dll\"
--"
-- )
-- endif ()
--endif ()
--
- configure_file(
- ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
- ${CMAKE_HOME_DIRECTORY}/GG/Config.h
---- GG/src/CMakeLists.txt
-+++ GG/src/CMakeLists.txt
-@@ -49,8 +49,6 @@
- dialogs/ColorDlg.cpp
- dialogs/FileDlg.cpp
- dialogs/ThreeButtonDlg.cpp
--
-- ../libltdl/ltdl.c
-
- adobe/adam.cpp
- adobe/adam_evaluate.cpp
-@@ -162,14 +160,21 @@
- )
- endif ()
-
--set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1)
--execute_process(
-- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h
-- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h
--)
--set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true)
--
--set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
-+find_library(LIBTOOL_LIB ltdl)
-+if (LIBTOOL_LIB)
-+ MESSAGE(STATUS " libtool-libraries : ${LIBTOOL_LIB}")
-+else (LIBTOOL_LIB)
-+ MESSAGE(FATAL_ERROR "libtool library not found!")
-+endif (LIBTOOL_LIB)
-+
-+find_file(LIBTOOL_HEADER ltdl.h PATHS ${CMAKE_INCLUDE_PATH})
-+if (LIBTOOL_HEADER)
-+ MESSAGE(STATUS " libtool-header : ${LIBTOOL_HEADER}")
-+else (LIBTOOL_HEADER)
-+ MESSAGE(FATAL_ERROR "libtool header not found!")
-+endif (LIBTOOL_HEADER)
-+
-+set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBTOOL_LIB})
- if (USE_DEVIL)
- list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
- else ()
---- GG/GG/PluginInterface.h
-+++ GG/GG/PluginInterface.h
-@@ -35,7 +35,7 @@
- #if defined(__APPLE__) && defined(__MACH__)
- # include "../libltdl/ltdl.h"
- #else
--# include <GG/ltdl.h>
-+# include <ltdl.h>
- #endif
-
- #include <string>
+++ /dev/null
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit cmake-utils eutils python subversion
-
-DESCRIPTION="An OpenGL interface library"
-HOMEPAGE="http://gigi.sourceforge.net"
-ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk"
-ESVN_PROJECT="${PN}"
-ESVN_REVISION="${PV#*_pre}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="" # keywords removed due to fragile nature of this package
-IUSE="devil doc eve ogre ois sdl static-libs threads"
-RESTRICT="test" # fails for unknown reasons
-
-RDEPEND="
- >=dev-libs/boost-1.47
- media-libs/freetype:2
- sys-devel/libtool
- sys-libs/zlib
- x11-libs/libX11
- virtual/opengl
- devil? ( >=media-libs/devil-1.6.1 )
- !devil? (
- media-libs/libpng:0
- media-libs/tiff:0
- virtual/jpeg
- )
- ogre? (
- >=dev-games/ogre-1.7.4[ois?]
- ois? ( dev-games/ois )
- )
- sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-REQUIRED_USE="ois? ( ogre )"
-
-CMAKE_USE_DIR="${S}"/GG
-CMAKE_VERBOSE="1"
-
-pkg_setup() {
- ewarn "${PN} needs about 4GB of memory for compilation and"
- ewarn "may even then swap out heavily."
- ewarn ""
- ewarn "If you get segfault during build time try disabling debug"
- ewarn "compiler flags https://qa.mandriva.com/show_bug.cgi?id=62558"
- ewarn "If that fails too consider retrying with gcc:4.4"
-
- sleep 5
- python_pkg_setup
-}
-
-src_prepare() {
- # fix docdir
- epatch "${FILESDIR}"/${P}-docdir.patch
-
- # use systems ltdl
- rm -r "${CMAKE_USE_DIR}"/libltdl || die
- epatch "${FILESDIR}"/${P}-libtool.patch
-
- # fix devil (apply after libtool.patch)
- epatch "${FILESDIR}"/${P}-devil.patch
-
- python_convert_shebangs 2 GG/GG/gen_signals.py
-}
-
-src_configure() {
- # USE_DEVIL broken
- # BUILD_TUTORIALS incomplete
- local mycmakeargs=(
- -DDOCDIR=/usr/share/doc/${PF}/html
- -DRELEASE_COMPILE_FLAGS=""
- $(cmake-utils_use_use devil DEVIL)
- $(cmake-utils_use_build eve EXPERIMENTAL_EVE_SUPPORT)
- $(cmake-utils_use_build ogre OGRE_DRIVER)
- $(cmake-utils_use_build ois OGRE_OIS_PLUGIN)
- $(cmake-utils_use_build sdl SDL_DRIVER)
- $(cmake-utils_use_build doc DOCUMENTATION)
- $(cmake-utils_use_build static-libs STATIC)
- $(cmake-utils_use_build threads MULTI_THREADED)
- )
-
- cmake-utils_src_configure
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>maintainer-wanted@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="devil">Use DevIL instead of libpng/libjpeg/libtiff</flag>
- <flag name="eve">Add experimental eve support</flag>
- <flag name="ogre">Add support for <pkg>dev-games/ogre</pkg></flag>
- <flag name="ois">Add support for <pkg>dev-games/ois</pkg></flag>
- </use>
-</pkgmetadata>
+++ /dev/null
-# ChangeLog for games-strategy/freeorion
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 05 May 2012; Mike Gilbert <floppym@gentoo.org> freeorion-0.3.17_p4823.ebuild:
- Use pkgconfig virtual.
-
- 23 Apr 2012; hasufell <julian.ospald@googlemail.com>
- freeorion-0.3.17_p4823.ebuild:
- fix dep
-
-*freeorion-0.3.17_p4823 (23 Apr 2012)
-
- 23 Apr 2012; hasufell <julian.ospald@googlemail.com>
- +freeorion-0.3.17_p4823.ebuild, +metadata.xml:
- New Ebuild for bug 402019 thanks to all
-
+++ /dev/null
-EBUILD freeorion-0.3.17_p4823.ebuild 2478 RMD160 45c87a97c5d807e8e0578eea8636737c2b73538d SHA1 f8e763289e10616ee746431728d083c375262585 SHA256 535883bf1ea50df63be987198aa03e149eac394b841973de910d538fe7851f3a
-MISC ChangeLog 516 RMD160 4b070dd7e5176ef531e268cfaba853d7e2b5d049 SHA1 edef0c71f201fb0b00ed5b8af6ed8da6c1a08c9a SHA256 130a5e6999ac0b8b9105a217d3b753c06287c3f039cb99b32b17c7a696f061f7
-MISC metadata.xml 292 RMD160 cfccc097a16bb7e1dc694fba1f11ca50c74c8acc SHA1 ad07aef2a2b6b2370f37c9570d1e082ea2067322 SHA256 8cec5948c2ddd4e5d1db70813a9aa693d7d7ac5558631855e28c456a7a05994d
+++ /dev/null
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit cmake-utils python subversion games
-
-DESCRIPTION="A free and open source clone of Master Of Orion"
-HOMEPAGE="http://www.freeorion.org"
-ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk"
-ESVN_PROJECT="${PN}"
-ESVN_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
-SLOT="0"
-KEYWORDS="" # dependency gigi unkeyworded and potentially broken
-IUSE="cg"
-
-RDEPEND="
- dev-games/gigi[ogre,ois]
- dev-games/ogre[cg?,opengl]
- >=dev-libs/boost-1.47[python]
- media-libs/freealut
- media-libs/libogg
- media-libs/libsdl[X,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- sci-physics/bullet
- sys-libs/zlib
- virtual/opengl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CMAKE_USE_DIR="${S}"/FreeOrion
-CMAKE_VERBOSE="1"
-
-src_unpack() {
- subversion_src_unpack
-}
-
-src_prepare() {
- # set OGRE plugin-dir
- sed \
- -e "s:PluginFolder=.:PluginFolder=$(pkg-config --variable=plugindir OGRE):" \
- -i "${CMAKE_USE_DIR}"/ogre_plugins.cfg || die
-
- # set revision number
- sed \
- -e "/svn_revision_number/s:???:${ESVN_REVISION}:" \
- -i "${CMAKE_USE_DIR}"/CMakeLists.txt || die
-
- if use cg ; then
- # add cg ogre plugin to config
- echo "Plugin=Plugin_CgProgramManager" \
- >> "${CMAKE_USE_DIR}"/ogre_plugins.cfg || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DRELEASE_COMPILE_FLAGS=""
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- # data files
- rm "${CMAKE_USE_DIR}"/default/COPYING || die
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r "${CMAKE_USE_DIR}"/default || die
-
- # bin
- dogamesbin "${CMAKE_BUILD_DIR}"/${PN}{ca,d} || die
- newgamesbin "${CMAKE_BUILD_DIR}"/${PN} ${PN}.bin || die
- games_make_wrapper ${PN} \
- "${GAMES_BINDIR}/${PN}.bin --resource-dir ./default" \
- "${GAMES_DATADIR}/${PN}"
-
- # config
- insinto "${GAMES_SYSCONFDIR}"/${PN}
- doins "${CMAKE_USE_DIR}"/{OISInput,ogre_plugins}.cfg || die
- # game uses relative paths
- dosym "${GAMES_SYSCONFDIR}"/${PN}/ogre_plugins.cfg \
- "${GAMES_DATADIR}"/${PN}/ogre_plugins.cfg || die
- dosym "${GAMES_SYSCONFDIR}"/${PN}/OISInput.cfg \
- "${GAMES_DATADIR}"/${PN}/OISInput.cfg || die
-
- # other
- dodoc "${CMAKE_USE_DIR}"/changelog.txt || die
- newicon "${CMAKE_USE_DIR}"/default/data/art/icons/FO_Icon_32x32.png \
- ${PN}.png || die
- make_desktop_entry ${PN} ${PN} ${PN}
-
- # permissions
- prepgamesdirs
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>maintainer-wanted@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="cg">Add support for NVIDIA toolkit plugin</flag>
- </use>
-</pkgmetadata>
+++ /dev/null
-# ChangeLog for mail-filter/libdkim
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 07 Oct 2011; Markos Chandras <hwoarang@gentoo.org> libdkim-1.0.21.ebuild:
- Drop non-existing dependency to mail-filter/libdkim-exim
-
- 14 Sep 2011; Peter Volkov <pva@gentoo.org> -libdkim-1.0.19.ebuild:
- Drop old.
-
- 07 Sep 2011; Andreis Vinogradovs <spamslepnoga@inbox.ru>
- +libdkim-1.0.21.ebuild, files/libdkim-gentoo.patch:
- Update Ebuild for bug 262919; thanks to pva
-
- 19 Mar 2009; Brandon Turner (bltcoder) <bturner@bltweb.net>
- +libdkim-1.0.19.ebuild, +files/libdkim-extra-options.patch,
- +files/libdkim-gentoo.patch, +metadata.xml:
- New Ebuild for bug 262919 thanks to hwoarang, Tommy[D]
-
+++ /dev/null
-AUX libdkim-extra-options.patch 2614 RMD160 e17fc80897d3918b306b63761b2b59296f71c8ba SHA1 42fe6b1ff66fad250abdd5c9ae0d57a91eff00b0 SHA256 4cc9eed6273fab56b29aede8235ead9a9441e9b2d0309a08e412d79ff9bfdc9f
-AUX libdkim-gentoo.patch 1506 RMD160 9b9b5f9be34f175d94c9af6e2673a82ec0d36f90 SHA1 5c674a0963c4fd7a0ab00e36086ede4d152bdba2 SHA256 fbe04a72e74e4c91e7101a86cd53f8323f7f3ec23e09909439e3eb29216cfa39
-DIST libdkim-1.0.21.zip 55049 RMD160 e69691003de9312533e696fee03463aac8606a0c SHA1 8a672e85ac5b3678bde454f19315ca7679bdef9a SHA256 dc685c8c47384c5d0379a1bcc0c96c8b7877a01e0c3bfedd6a54ae4ebdfa0323
-EBUILD libdkim-1.0.21.ebuild 790 RMD160 13cf6155e9e358cc347779702089d1f5f3c910dd SHA1 af47379e0efb8cd3cf0b2710049aedff0dcd2e89 SHA256 bbf493f3025dfb96e24ea225c8f0d73ff43eaad9e672dac62981049cccb9e154
-MISC ChangeLog 726 RMD160 ea90b9742bb27499e08acbe09cbac03a0623b91f SHA1 949bde02f2c118ba4226daf9b09eca74ef2bde2b SHA256 850917d3cf77c800e75c3735289938b30554813bda88655a8e50de2d9e4b06ee
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+++ /dev/null
-diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp
---- libdkim.orig/src/libdkimtest.cpp 2009-03-13 16:17:45.000000000 -0500
-+++ libdkim/src/libdkimtest.cpp 2009-03-13 16:26:02.000000000 -0500
-@@ -55,8 +55,23 @@
- return 0;\r
- }\r
- \r
-+void usage()\r
-+{\r
- \r
--\r
-+ printf( "usage: libdkimtest [-b<allman|ietf|both>] [-c<r|s|t|u>] [-d<domain>] [-l] [-h] [-i<you@yourdomain.com>] [-q] [-s] [-t] [-v] [-x<expire time>] [-z<hash>] <msgfile> <privkeyfile> <outfile>\n");\r
-+ printf( "-b<standard> allman , ietf or both\n");\r
-+ printf( "-c<canonicalization> r for relaxed [DEFAULT], s - simple, t relaxed/simple, u - simple/relaxed\n");\r
-+ printf( "-d<domain> the domain tag, if not provided it will be determined from the sender/from header\n");\r
-+ printf( "-l include body length tag\n");\r
-+ printf( "-h this help\n");\r
-+ printf( "-i<identity> the identity, if not provided it will not be included\n");\r
-+ printf( "-s sign the message\n");\r
-+ printf( "-t include a timestamp tag\n");\r
-+ printf( "-v verify the message\n");\r
-+ printf( "-x<expire_time> the expire time in seconds since epoch ( DEFAULT = current time + 604800)\n\t if set to - then it will not be included");\r
-+ printf( "-z<hash> 1 for sha1, 2 for sha256, 3 for both\n");\r
-+ printf( "-y<selector> the selector tag DEFAULT=MDaemon\n");\r
-+}\r
- int main(int argc, char* argv[])\r
- {\r
- int n;\r
-@@ -77,7 +92,7 @@
- time(&t);\r
- \r
- opts.nCanon = DKIM_SIGN_RELAXED;\r
-- opts.nIncludeBodyLengthTag = 1;\r
-+ opts.nIncludeBodyLengthTag = 0;\r
- opts.nIncludeQueryMethod = 0;\r
- opts.nIncludeTimeStamp = 0;\r
- opts.expireTime = t + 604800; // expires in 1 week\r
-@@ -92,6 +107,11 @@
- int nArgParseState = 0;\r
- bool bSign = true;\r
- \r
-+ if(argc<2){\r
-+ usage();\r
-+ exit(1);\r
-+ }\r
-+\r
- for( n = 1; n < argc; n++ )\r
- {\r
- if( argv[n][0] == '-' && strlen(argv[n]) > 1 )\r
-@@ -121,14 +141,16 @@
- }\r
- break;\r
- \r
--\r
-+ case 'd': \r
-+ strncpy(opts.szDomain,(const char*)(argv[n]+2),sizeof(opts.szDomain)-1);\r
-+ break;\r
- case 'l': // body length tag\r
- opts.nIncludeBodyLengthTag = 1;\r
- break;\r
- \r
- \r
- case 'h':\r
-- printf( "usage: \n" );\r
-+ usage(); \r
- return 0;\r
- \r
- case 'i': // identity \r
-@@ -138,7 +160,7 @@
- }\r
- else\r
- {\r
-- strcpy( opts.szIdentity, argv[n] + 2 );\r
-+ strncpy( opts.szIdentity, argv[n] + 2,sizeof(opts.szIdentity)-1 );\r
- }\r
- break;\r
- \r
-@@ -169,6 +191,9 @@
- }\r
- break;\r
- \r
-+ case 'y':\r
-+ strncpy( opts.szSelector, argv[n]+2, sizeof(opts.szSelector)-1);\r
-+ break;\r
- \r
- case 'z': // sign w/ sha1, sha256 or both \r
- opts.nHash = atoi( &argv[n][2] );\r
+++ /dev/null
-diff --git a/src/Makefile b/src/Makefile
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,15 +1,10 @@
- # libdkim makefile for UNIX\r
- #\r
- \r
--#ifdef LINUX\r
--CFLAGS = -c\r
--LFLAGS = \r
-+DESTDIR ?= /\r
-+LIBDIR ?= lib64\r
-+CFLAGS += -fPIC\r
- LIBS = -lcrypto -lresolv\r
--#else\r
--CFLAGS = -c\r
--LFLAGS = \r
--LIBS = -lcrypto \r
--#endif\r
- \r
- INCL = -I /usr/include/openssl/\r
- \r
-@@ -19,23 +14,35 @@
- \r
- HDRS = dkim.h dns.h dkimbase.h dkimsign.h dkimverify.h\r
- \r
--all: libdkim.a libdkimtest\r
-+all: libdkim.so.1 libdkimtest\r
- \r
- libdkim.a: $(OBJS)\r
- rm -f libdkim.a\r
- ar cr libdkim.a $(OBJS)\r
- ranlib libdkim.a\r
- \r
--libdkimtest : libdkim.a libdkimtest.o\r
-- g++ -olibdkimtest $(LFLAGS) \\r
-- -L . libdkimtest.o $(LIBS) -ldkim\r
-+libdkim.so.1: $(OBJS)\r
-+ $(CXX) -shared -Wl,-soname,$@.1 $(LDFLAGS) $(OBJS) -o $@ $(LIBS)\r
-+ ln -s $@ libdkim.so\r
-+\r
-+.cpp.o:\r
-+ $(CXX) $(CFLAGS) -c $<\r
-+\r
-+libdkimtest : libdkim.so.1 libdkimtest.o\r
-+ $(CXX) -o$@ $(LDFLAGS) \\r
-+ -L. libdkimtest.o $(LIBS) -ldkim\r
- \r
- libdkimtest.o: libdkimtest.cpp $(HDRS)\r
- \r
--.cpp.o:\r
-- g++ $(CFLAGS) -c $<\r
- \r
- clean:\r
-- rm *.o libdkim.lib libdkimtest\r
-+ rm -f *.o libdkim.{a,so,so.1} libdkimtest\r
- \r
-+install: all\r
-+ install -D -m 0755 libdkim.so.1 $(DESTDIR)/usr/$(LIBDIR)/libdkim.so.1\r
-+ ln -s libdkim.so.1 $(DESTDIR)/usr/$(LIBDIR)/libdkim.so\r
-+ ln -s libdkim.so.1 $(DESTDIR)/usr/$(LIBDIR)/libdkim.so.1.1\r
-+ install -D -m 0644 dkim.h $(DESTDIR)/usr/include/dkim.h\r
-+ install -D -m 0755 libdkimtest $(DESTDIR)/usr/bin/libdkimtest\r
- \r
-+\r
+++ /dev/null
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A library to verify and create signatures of e-mail headers."
-HOMEPAGE="http://libdkim.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl
- app-arch/unzip"
-RDEPEND="dev-libs/openssl"
-
-S=${WORKDIR}/${PN}/src
-
-src_prepare() {
- ecvs_clean
- # upstream claims to be portable, but isn't very
- epatch "${FILESDIR}/${PN}-gentoo.patch"
- epatch "${FILESDIR}/${PN}-extra-options.patch"
-}
-
-src_compile() {
- tc-export CXX
- emake LIBDIR=$(get_libdir)
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
- dodoc ../README
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
-</pkgmetadata>
projects / ~andy / sunrise / commitdiff