scm-commits November 2011

scm-commits@lists.fedoraproject.org

403 participants
11021 discussions

[pam_mapi] Initial import of pam_mapi for Fedora and Red Hat Enterprise Linux
by Robert Scheck 30 Nov '11

30 Nov '11

commit b91541b3f818ed8d8e0eff295ccc414a359746f3 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 30 23:29:19 2011 +0100 Initial import of pam_mapi for Fedora and Red Hat Enterprise Linux .gitignore | 1 + pam_mapi.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 56 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..429aaba 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +pam_mapi-0.1.0.tar.gz diff --git a/pam_mapi.spec b/pam_mapi.spec new file mode 100644 index 0000000..d56e155 --- /dev/null +++ b/pam_mapi.spec @@ -0,0 +1,54 @@ +Summary: PAM module for authentication via MAPI against a Zarafa server +Name: pam_mapi +Version: 0.1.0 +Release: 1%{?dist} +License: BSD and GPLv2+ +Group: System Environment/Base +URL: http://ftp.robert-scheck.de/linux/%{name}/ +Source: http://ftp.robert-scheck.de/linux/%{name}/%{name}-%{version}.tar.gz +BuildRequires: zarafa-devel >= 6.30.0, pam-devel, %{_includedir}/uuid/uuid.h, zlib-devel +%if 0%{?rhel}%{?fedora} > 5 +BuildRequires: libicu-devel >= 3.4 +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +pam_mapi is a PAM module (Pluggable Authentication Modules) for authentication +against a Zarafa server. Applications like Zarafa WebAccess, Zarafa WebApp or +Microsoft Outlook which directly connect to the Zarafa Collaboration Platform +use MAPI in SOAP to do so. If Zarafa is configured to use the DB authentication +plugin, all user information are stored in a MySQL database. + +Once IMAP/POP3 is used via the Zarafa Gateway, SMTP gets involved for outbound +e-mails, too. Usually this requires SMTP authentication (to avoid open relays), +but the user information in the MySQL database is unfortunately not accessible +for established SASL daemons. The pam_mapi module is filling this gap by adding +MAPI-based authentication to PAM and thus to SMTP daemons via SASL. + +Just execute "cat %{_docdir}/%{name}-%{version}/pam.conf > %{_sysconfdir}/pam.d/smtp" for +a simple setup. Please read the documentation for more extended configurations. + +%prep +%setup -q + +%build +%configure --libdir=/%{_lib} +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc ChangeLog COPYING README pam.conf +/%{_lib}/security/%{name}.so +%{_mandir}/man8/%{name}.8* + +%changelog +* Tue Nov 29 2011 Robert Scheck <robert(a)fedoraproject.org> 0.1.0-1 +- Upgrade to 0.1.0 +- Initial spec file for Fedora and Red Hat Enterprise Linux diff --git a/sources b/sources index e69de29..7784ced 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +dcc2c675a25e8884da6aec7cd0e1fb30 pam_mapi-0.1.0.tar.gz

1 0

File pam_mapi-0.1.0.tar.gz uploaded to lookaside cache by robert
by Robert Scheck 30 Nov '11

30 Nov '11

A file has been added to the lookaside cache for pam_mapi: dcc2c675a25e8884da6aec7cd0e1fb30 pam_mapi-0.1.0.tar.gz

1 0

[pam_pkcs11/f16] Fix fails to build from source issue
by Robert Relyea 30 Nov '11

30 Nov '11

commit 89ccc437de790f7e38d895a9d3019f3cc3a86818 Author: Robert Relyea <rrelyea(a)redhat.com> Date: Wed Nov 30 14:13:23 2011 -0800 Fix fails to build from source issue pam_pkcs11-0.6.2-pcsc-lite.patch | 12 ++++++++++++ pam_pkcs11.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletions(-) --- diff --git a/pam_pkcs11-0.6.2-pcsc-lite.patch b/pam_pkcs11-0.6.2-pcsc-lite.patch new file mode 100644 index 0000000..990c6c2 --- /dev/null +++ b/pam_pkcs11-0.6.2-pcsc-lite.patch @@ -0,0 +1,12 @@ +diff -up ./src/tools/card_eventmgr.c.pcsc-lite ./src/tools/card_eventmgr.c +--- ./src/tools/card_eventmgr.c.pcsc-lite 2009-09-02 05:32:55.000000000 -0700 ++++ ./src/tools/card_eventmgr.c 2010-09-09 09:43:29.178974000 -0700 +@@ -311,7 +311,7 @@ static void signal_trap(int sig) + int main(int argc, char *argv[]) { + int current_reader; + LONG rv; +- SCARD_READERSTATE_A *rgReaderStates_t = NULL; ++ SCARD_READERSTATE *rgReaderStates_t = NULL; + DWORD dwReaders, dwReadersOld; + LPSTR mszReaders = NULL; + char *ptr, **readers = NULL; diff --git a/pam_pkcs11.spec b/pam_pkcs11.spec index 3497d04..e469fe3 100644 --- a/pam_pkcs11.spec +++ b/pam_pkcs11.spec @@ -6,7 +6,7 @@ Name: pam_pkcs11 Version: 0.6.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: PKCS #11/NSS PAM login module Group: System Environment/Base @@ -16,6 +16,7 @@ Source0: http://www.opensc-project.org/files/pam_pkcs11/%{name}-%{version}.tar. Source1: rh_pam_pkcs11.conf Source2: rh_pkcs11_eventmgr.conf patch1: pam_pkcs11-0.6.2-login_required.patch +patch2: pam_pkcs11-0.6.2-pcsc-lite.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel @@ -47,6 +48,7 @@ Additional included pam_pkcs11 related tools %prep %setup -q -n pam_pkcs11-%{version} %patch1 -p1 -b .login-required +%patch2 -p1 -b .pcsc-lite %build @@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/card_eventmgr.1.gz %changelog +* Thu Feb 10 2011 Bob Relyea <rrelyea(a)redhat.com> - 0.6.2-7 +- Update code to accept new pcsc-lite defines + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.6.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

1 0

[mingw32-wpcap] fix build and Windows 2000
by sailer 30 Nov '11

30 Nov '11

commit a0cb4f6577665ea5e0d05f07a69e8a766335c851 Author: Thomas Sailer <t.sailer(a)alumni.ethz.ch> Date: Wed Nov 30 23:08:57 2011 +0100 fix build and Windows 2000 mingw32-wpcap.spec | 11 +- wpcap-w2k.patch | 891 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 901 insertions(+), 1 deletions(-) --- diff --git a/mingw32-wpcap.spec b/mingw32-wpcap.spec index e2e6230..e8c18b6 100644 --- a/mingw32-wpcap.spec +++ b/mingw32-wpcap.spec @@ -7,7 +7,7 @@ Name: mingw32-wpcap Version: %{versionmajor}.%{versionminor}.final%{versionsuffix} -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW user-level packet capture Group: Development/Libraries @@ -16,6 +16,7 @@ URL: http://www.winpcap.org/ Source0: http://www.winpcap.org/install/bin/WpcapSrc_%{versionmajor}_%{versionminor}… Source1: wpcap.pc Patch0: wpcap.patch +Patch1: wpcap-w2k.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +70,10 @@ pushd wpcap/libpcap/Win32/Include/ mv ip6_misc.h IP6_misc.h popd +%patch1 -p0 -b .w2k + +find . -name GNUmakefile |xargs perl -i -pe 's,-mno-cygwin,,' + %build pushd packetNtx/Dll/Project make -f GNUmakefile CC=i686-pc-mingw32-gcc YACC=bison %{?_smp_mflags} @@ -146,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT %{wpcapexamples} %changelog +* Wed Nov 30 2011 Thomas Sailer <t.sailer(a)alumni.ethz.ch> - 4.1.final2-3 +- fix build +- make wpcap.dll work again on Windows 2000 + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.1.final2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/wpcap-w2k.patch b/wpcap-w2k.patch new file mode 100644 index 0000000..2dfa60d --- /dev/null +++ b/wpcap-w2k.patch @@ -0,0 +1,891 @@ +--- wpcap/libpcap/Makefile.in.w2k 2011-11-30 22:32:31.263582325 +0100 ++++ wpcap/libpcap/Makefile.in 2011-11-30 22:35:42.844865268 +0100 +@@ -86,13 +86,27 @@ + etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c + GENSRC = scanner.c grammar.c version.c + # HAVE_REMOTE +-REMOTESRC = @V_REMOTE_FILES@ ++REMOTESRC = @V_REMOTE_FILES@ \ ++ WspiapiClone.c \ ++ WspiapiFreeAddrInfo.c \ ++ WspiapiGetAddrInfo.c \ ++ WspiapiGetNameInfo.c \ ++ WspiapiLegacyFreeAddrInfo.c \ ++ WspiapiLegacyGetAddrInfo.c \ ++ WspiapiLegacyGetNameInfo.c \ ++ WspiapiLoad.c \ ++ WspiapiLookupNode.c \ ++ WspiapiNewAddrInfo.c \ ++ WspiapiParseV4Address.c \ ++ WspiapiQueryDNS.c \ ++ WspiapiStrdup.c + TCSRC = @V_TC_FILES@ + LIBOBJS = @LIBOBJS@ + + # HAVE_REMOTE + SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC) $(TCSRC) $(REMOTESRC) + ++ + # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot + # hack the extra indirection + # HAVE_REMOTE +@@ -118,7 +132,8 @@ + pcap-namedb.h \ + pcap-stdinc.h \ + ppp.h \ +- sunatmpos.h ++ sunatmpos.h \ ++ wspiapi.h + + GENHDR = \ + scanner.h tokdefs.h version.h +--- wpcap/libpcap/WspiapiClone.c.w2k 2011-11-30 22:31:14.690287820 +0100 ++++ wpcap/libpcap/WspiapiClone.c 2011-11-30 22:31:14.690287820 +0100 +@@ -0,0 +1,28 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++int WINAPI ++WspiapiClone (WORD wPort, struct addrinfo *ptResult) ++{ ++ struct addrinfo *p = NULL; ++ struct addrinfo *n = NULL; ++ ++ for (p = ptResult; p != NULL;) ++ { ++ n = WspiapiNewAddrInfo (SOCK_DGRAM, p->ai_protocol, wPort, ++ ((struct sockaddr_in *) p->ai_addr)->sin_addr.s_addr); ++ if (!n) ++ break; ++ n->ai_next = p->ai_next; ++ p->ai_next = n; ++ p = n->ai_next; ++ } ++ if (p != NULL) ++ return EAI_MEMORY; ++ return 0; ++} +--- wpcap/libpcap/WspiapiFreeAddrInfo.c.w2k 2011-11-30 22:31:14.690287820 +0100 ++++ wpcap/libpcap/WspiapiFreeAddrInfo.c 2011-11-30 22:31:14.690287820 +0100 +@@ -0,0 +1,17 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++void WINAPI ++WspiapiFreeAddrInfo (struct addrinfo *ai) ++{ ++ static WSPIAPI_PFREEADDRINFO pfFreeAddrInfo = NULL; ++ ++ if (!pfFreeAddrInfo) ++ pfFreeAddrInfo = (WSPIAPI_PFREEADDRINFO) WspiapiLoad(2); ++ (*pfFreeAddrInfo) (ai); ++} +--- wpcap/libpcap/WspiapiGetAddrInfo.c.w2k 2011-11-30 22:31:14.691287837 +0100 ++++ wpcap/libpcap/WspiapiGetAddrInfo.c 2011-11-30 22:31:14.691287837 +0100 +@@ -0,0 +1,21 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++int WINAPI ++WspiapiGetAddrInfo(const char *nodename, const char *servname, ++ const struct addrinfo *hints, struct addrinfo **res) ++{ ++ static WSPIAPI_PGETADDRINFO pfGetAddrInfo = NULL; ++ int err; ++ ++ if (!pfGetAddrInfo) ++ pfGetAddrInfo = (WSPIAPI_PGETADDRINFO) WspiapiLoad (0); ++ err = (*pfGetAddrInfo) (nodename, servname, hints, res); ++ WSASetLastError (err); ++ return err; ++} +--- wpcap/libpcap/WspiapiGetNameInfo.c.w2k 2011-11-30 22:31:14.691287837 +0100 ++++ wpcap/libpcap/WspiapiGetNameInfo.c 2011-11-30 22:31:14.691287837 +0100 +@@ -0,0 +1,22 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++int WINAPI ++WspiapiGetNameInfo (const struct sockaddr *sa, socklen_t salen, ++ char *host, size_t hostlen, ++ char *serv, size_t servlen, int flags) ++{ ++ static WSPIAPI_PGETNAMEINFO pfGetNameInfo = NULL; ++ int err; ++ ++ if (!pfGetNameInfo) ++ pfGetNameInfo = (WSPIAPI_PGETNAMEINFO) WspiapiLoad(1); ++ err = (*pfGetNameInfo) (sa, salen, host, hostlen, serv, servlen, flags); ++ WSASetLastError (err); ++ return err; ++} +--- wpcap/libpcap/WspiapiLegacyFreeAddrInfo.c.w2k 2011-11-30 22:31:14.691287837 +0100 ++++ wpcap/libpcap/WspiapiLegacyFreeAddrInfo.c 2011-11-30 22:31:14.691287837 +0100 +@@ -0,0 +1,23 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++void WINAPI ++WspiapiLegacyFreeAddrInfo (struct addrinfo *ptHead) ++{ ++ struct addrinfo *p; ++ ++ for (p = ptHead; p != NULL; p = ptHead) ++ { ++ if (p->ai_canonname) ++ WspiapiFree (p->ai_canonname); ++ if (p->ai_addr) ++ WspiapiFree (p->ai_addr); ++ ptHead = p->ai_next; ++ WspiapiFree (p); ++ } ++} +--- wpcap/libpcap/WspiapiLegacyGetAddrInfo.c.w2k 2011-11-30 22:31:14.691287837 +0100 ++++ wpcap/libpcap/WspiapiLegacyGetAddrInfo.c 2011-11-30 22:31:14.691287837 +0100 +@@ -0,0 +1,112 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++int WINAPI ++WspiapiLegacyGetAddrInfo(const char *pszNodeName, ++ const char *pszServiceName, ++ const struct addrinfo *ptHints, ++ struct addrinfo **pptResult) ++{ ++ int err = 0, iFlags = 0, iFamily = PF_UNSPEC, iSocketType = 0, iProtocol = 0; ++ struct in_addr inAddress; ++ struct servent *svc = NULL; ++ char *pc = NULL; ++ WINBOOL isCloned = FALSE; ++ WORD tcpPort = 0, udpPort = 0, port = 0; ++ ++ *pptResult = NULL; ++ if (!pszNodeName && !pszServiceName) ++ return EAI_NONAME; ++ if (ptHints) ++ { ++ if (ptHints->ai_addrlen != 0 || ptHints->ai_canonname != NULL ++ || ptHints->ai_addr!=NULL || ptHints->ai_next != NULL) ++ return EAI_FAIL; ++ iFlags = ptHints->ai_flags; ++ if ((iFlags & AI_CANONNAME) != 0 && !pszNodeName) ++ return EAI_BADFLAGS; ++ iFamily = ptHints->ai_family; ++ if (iFamily != PF_UNSPEC && iFamily != PF_INET) ++ return EAI_FAMILY; ++ iSocketType = ptHints->ai_socktype; ++ if (iSocketType != 0 && iSocketType != SOCK_STREAM && iSocketType != SOCK_DGRAM ++ && iSocketType != SOCK_RAW) ++ return EAI_SOCKTYPE; ++ iProtocol = ptHints->ai_protocol; ++ } ++ ++ if (pszServiceName) ++ { ++ port = (WORD) strtoul (pszServiceName, &pc, 10); ++ if(*pc == 0) ++ { ++ port = tcpPort = udpPort = htons (port); ++ if (iSocketType == 0) ++ { ++ isCloned = TRUE; ++ iSocketType = SOCK_STREAM; ++ } ++ } ++ else ++ { ++ if (iSocketType == 0 || iSocketType == SOCK_DGRAM) ++ { ++ svc = getservbyname(pszServiceName, "udp"); ++ if (svc) ++ port = udpPort = svc->s_port; ++ } ++ if (iSocketType == 0 || iSocketType == SOCK_STREAM) ++ { ++ svc = getservbyname(pszServiceName, "tcp"); ++ if (svc) ++ port = tcpPort = svc->s_port; ++ } ++ if (port == 0) ++ return (iSocketType ? EAI_SERVICE : EAI_NONAME); ++ if (iSocketType==0) ++ { ++ iSocketType = (tcpPort) ? SOCK_STREAM : SOCK_DGRAM; ++ isCloned = (tcpPort && udpPort); ++ } ++ } ++ } ++ if (!pszNodeName || WspiapiParseV4Address(pszNodeName,&inAddress.s_addr)) ++ { ++ if (!pszNodeName) ++ { ++ inAddress.s_addr = htonl ((iFlags & AI_PASSIVE) ? INADDR_ANY : INADDR_LOOPBACK); ++ } ++ *pptResult = WspiapiNewAddrInfo(iSocketType, iProtocol, port, inAddress.s_addr); ++ if (!(*pptResult)) ++ err = EAI_MEMORY; ++ if (!err && pszNodeName) ++ { ++ (*pptResult)->ai_flags |= AI_NUMERICHOST; ++ if (iFlags & AI_CANONNAME) ++ { ++ (*pptResult)->ai_canonname = ++ WspiapiStrdup (inet_ntoa (inAddress)); ++ if (!(*pptResult)->ai_canonname) ++ err = EAI_MEMORY; ++ } ++ } ++ } ++ else if (iFlags & AI_NUMERICHOST) ++ err = EAI_NONAME; ++ else ++ err = WspiapiLookupNode (pszNodeName, iSocketType, iProtocol, port, ++ (iFlags & AI_CANONNAME), pptResult); ++ if (!err && isCloned) ++ err = WspiapiClone(udpPort, *pptResult); ++ if (err) ++ { ++ WspiapiLegacyFreeAddrInfo (*pptResult); ++ *pptResult = NULL; ++ } ++ return err; ++} +--- wpcap/libpcap/WspiapiLegacyGetNameInfo.c.w2k 2011-11-30 22:31:14.691287837 +0100 ++++ wpcap/libpcap/WspiapiLegacyGetNameInfo.c 2011-11-30 22:31:14.691287837 +0100 +@@ -0,0 +1,88 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++int WINAPI ++WspiapiLegacyGetNameInfo (const struct sockaddr *ptSocketAddress, ++ socklen_t tSocketLength, ++ char *pszNodeName, size_t tNodeLength, ++ char *pszServiceName, size_t tServiceLength, ++ int iFlags) ++{ ++ struct servent *svc; ++ WORD port; ++ char str[] = "65535"; ++ char *pstr = str; ++ struct hostent *phost; ++ struct in_addr l_inaddr; ++ char *pnode = NULL, *pc = NULL; ++ ++ if (!ptSocketAddress || tSocketLength < (int) sizeof (struct sockaddr)) ++ return EAI_FAIL; ++ if (ptSocketAddress->sa_family != AF_INET) ++ return EAI_FAMILY; ++ if (tSocketLength < (int) sizeof (struct sockaddr_in)) ++ return EAI_FAIL; ++ if (!(pszNodeName && tNodeLength) && !(pszServiceName && tServiceLength)) ++ return EAI_NONAME; ++ if ((iFlags & NI_NUMERICHOST) != 0 && (iFlags & NI_NAMEREQD) != 0) ++ return EAI_BADFLAGS; ++ if (pszServiceName && tServiceLength) ++ { ++ port = ((struct sockaddr_in *) ptSocketAddress)->sin_port; ++ if (iFlags & NI_NUMERICSERV) ++ sprintf (str, "%u", ntohs (port)); ++ else ++ { ++ svc = getservbyport(port, (iFlags & NI_DGRAM) ? "udp" : NULL); ++ if (svc && svc->s_name) ++ pstr = svc->s_name; ++ else ++ sprintf (str, "%u", ntohs (port)); ++ } ++ if (tServiceLength > strlen (pstr)) ++ strcpy (pszServiceName, pstr); ++ else ++ return EAI_FAIL; ++ } ++ if (pszNodeName && tNodeLength) ++ { ++ l_inaddr = ((struct sockaddr_in *) ptSocketAddress)->sin_addr; ++ if (iFlags & NI_NUMERICHOST) ++ pnode = inet_ntoa (l_inaddr); ++ else ++ { ++ phost = gethostbyaddr ((char *) &l_inaddr, sizeof (struct in_addr), AF_INET); ++ if (phost && phost->h_name) ++ { ++ pnode = phost->h_name; ++ if ((iFlags & NI_NOFQDN) != 0 && ((pc = strchr (pnode,'.')) != NULL)) ++ *pc = 0; ++ } ++ else ++ { ++ if ((iFlags & NI_NAMEREQD) != 0) ++ { ++ switch(WSAGetLastError()) ++ { ++ case WSAHOST_NOT_FOUND: return EAI_NONAME; ++ case WSATRY_AGAIN: return EAI_AGAIN; ++ case WSANO_RECOVERY: return EAI_FAIL; ++ default: return EAI_NONAME; ++ } ++ } ++ else ++ pnode = inet_ntoa (l_inaddr); ++ } ++ } ++ if (tNodeLength > strlen (pnode)) ++ strcpy (pszNodeName, pnode); ++ else ++ return EAI_FAIL; ++ } ++ return 0; ++} +--- wpcap/libpcap/WspiapiLoad.c.w2k 2011-11-30 22:31:14.691287837 +0100 ++++ wpcap/libpcap/WspiapiLoad.c 2011-11-30 22:31:14.691287837 +0100 +@@ -0,0 +1,75 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++FARPROC WINAPI ++WspiapiLoad (WORD wFunction) ++{ ++ static WINBOOL isinit = FALSE; ++ static WSPIAPI_FUNCTION rgtGlobal[] = WSPIAPI_FUNCTION_ARRAY; ++ static const int iNumGlobal = (sizeof(rgtGlobal) / sizeof(WSPIAPI_FUNCTION)); ++ HMODULE hlib = NULL; ++ WSPIAPI_FUNCTION rgtLocal[] = WSPIAPI_FUNCTION_ARRAY; ++ FARPROC fScratch = NULL; ++ int i = 0; ++ ++ if (isinit) ++ return rgtGlobal[wFunction].pfAddress; ++ ++ for (;;) ++ { ++ CHAR systemdir[MAX_PATH + 1], path[MAX_PATH + 8]; ++ ++ if (GetSystemDirectoryA (systemdir, MAX_PATH) == 0) ++ break; ++ strcpy (path, systemdir); ++ strcat (path, "\\ws2_32"); ++ hlib = LoadLibraryA (path); ++ if(hlib != NULL) ++ { ++ fScratch = GetProcAddress (hlib, "getaddrinfo"); ++ if (!fScratch) ++ { ++ FreeLibrary (hlib); ++ hlib = NULL; ++ } ++ } ++ if (hlib != NULL) ++ break; ++ strcpy (path, systemdir); ++ strcat (path, "\\wship6"); ++ hlib = LoadLibraryA (path); ++ if (hlib != NULL) ++ { ++ if ((fScratch = GetProcAddress (hlib, "getaddrinfo")) == NULL) ++ { ++ FreeLibrary (hlib); ++ hlib = NULL; ++ } ++ } ++ break; ++ } ++ if (hlib != NULL) ++ { ++ for (i = 0; i < iNumGlobal; i++) ++ { ++ if ((rgtLocal[i].pfAddress = GetProcAddress (hlib, rgtLocal[i].pszName)) == NULL) ++ { ++ FreeLibrary (hlib); ++ hlib = NULL; ++ break; ++ } ++ } ++ if (hlib != NULL) ++ { ++ for (i = 0; i < iNumGlobal; i++) ++ rgtGlobal[i].pfAddress = rgtLocal[i].pfAddress; ++ } ++ } ++ isinit = TRUE; ++ return rgtGlobal[wFunction].pfAddress; ++} +--- wpcap/libpcap/WspiapiLookupNode.c.w2k 2011-11-30 22:31:14.691287837 +0100 ++++ wpcap/libpcap/WspiapiLookupNode.c 2011-11-30 22:31:14.691287837 +0100 +@@ -0,0 +1,44 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++int WINAPI ++WspiapiLookupNode (const char *pszNodeName, ++ int iSocketType, int iProtocol, ++ WORD wPort, WINBOOL bAI_CANONNAME, ++ struct addrinfo **pptResult) ++{ ++ int err = 0, cntAlias = 0; ++ char name[NI_MAXHOST] = ""; ++ char alias[NI_MAXHOST] = ""; ++ char *pname = name, *palias = alias, *tmp = NULL; ++ ++ strncpy (pname, pszNodeName, NI_MAXHOST - 1); ++ pname[NI_MAXHOST - 1] = 0; ++ for (;;) ++ { ++ err = WspiapiQueryDNS (pszNodeName, iSocketType, iProtocol, wPort, palias, pptResult); ++ if (err) ++ break; ++ if (*pptResult) ++ break; ++ ++cntAlias; ++ if (strlen (palias) == 0 || !strcmp (pname, palias) || cntAlias == 16) ++ { ++ err = EAI_FAIL; ++ break; ++ } ++ WspiapiSwap(pname, palias, tmp); ++ } ++ if (!err && bAI_CANONNAME) ++ { ++ (*pptResult)->ai_canonname = WspiapiStrdup (palias); ++ if (!(*pptResult)->ai_canonname) ++ err = EAI_MEMORY; ++ } ++ return err; ++} +--- wpcap/libpcap/WspiapiNewAddrInfo.c.w2k 2011-11-30 22:31:14.691287837 +0100 ++++ wpcap/libpcap/WspiapiNewAddrInfo.c 2011-11-30 22:31:14.691287837 +0100 +@@ -0,0 +1,31 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++struct addrinfo * WINAPI ++WspiapiNewAddrInfo (int iSocketType, int iProtocol, WORD wPort, DWORD dwAddress) ++{ ++ struct addrinfo *n; ++ struct sockaddr_in *pa; ++ ++ if ((n = (struct addrinfo *) WspiapiMalloc (sizeof (struct addrinfo))) == NULL) ++ return NULL; ++ if ((pa = (struct sockaddr_in *) WspiapiMalloc (sizeof(struct sockaddr_in))) == NULL) ++ { ++ WspiapiFree(n); ++ return NULL; ++ } ++ pa->sin_family = AF_INET; ++ pa->sin_port = wPort; ++ pa->sin_addr.s_addr = dwAddress; ++ n->ai_family = PF_INET; ++ n->ai_socktype = iSocketType; ++ n->ai_protocol = iProtocol; ++ n->ai_addrlen = sizeof (struct sockaddr_in); ++ n->ai_addr = (struct sockaddr *) pa; ++ return n; ++} +--- wpcap/libpcap/WspiapiParseV4Address.c.w2k 2011-11-30 22:31:14.692287854 +0100 ++++ wpcap/libpcap/WspiapiParseV4Address.c 2011-11-30 22:31:14.692287854 +0100 +@@ -0,0 +1,26 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++WINBOOL WINAPI ++WspiapiParseV4Address (const char *pszAddress, PDWORD pdwAddress) ++{ ++ DWORD dwAddress = 0; ++ const char *h = NULL; ++ int cnt; ++ ++ for (cnt = 0,h = pszAddress; *h != 0; h++) ++ if (h[0] == '.') ++ cnt++; ++ if (cnt != 3) ++ return FALSE; ++ dwAddress = inet_addr (pszAddress); ++ if (dwAddress == INADDR_NONE) ++ return FALSE; ++ *pdwAddress = dwAddress; ++ return TRUE; ++} +--- wpcap/libpcap/WspiapiQueryDNS.c.w2k 2011-11-30 22:31:14.692287854 +0100 ++++ wpcap/libpcap/WspiapiQueryDNS.c 2011-11-30 22:31:14.692287854 +0100 +@@ -0,0 +1,48 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++int WINAPI ++WspiapiQueryDNS(const char *pszNodeName, ++ int iSocketType, int iProtocol, ++ WORD wPort, char pszAlias[NI_MAXHOST], ++ struct addrinfo **pptResult) ++{ ++ struct addrinfo **paddrinfo = pptResult; ++ struct hostent *phost = NULL; ++ char **h; ++ ++ *paddrinfo = NULL; ++ pszAlias[0] = 0; ++ phost = gethostbyname (pszNodeName); ++ if (phost) ++ { ++ if (phost->h_addrtype == AF_INET && phost->h_length == sizeof(struct in_addr)) ++ { ++ for (h = phost->h_addr_list; *h != NULL; h++) ++ { ++ *paddrinfo = WspiapiNewAddrInfo (iSocketType, iProtocol, wPort, ++ ((struct in_addr *) *h)->s_addr); ++ if (!*paddrinfo) ++ return EAI_MEMORY; ++ paddrinfo = &((*paddrinfo)->ai_next); ++ } ++ } ++ strncpy (pszAlias, phost->h_name, NI_MAXHOST - 1); ++ pszAlias[NI_MAXHOST - 1] = 0; ++ return 0; ++ } ++ switch(WSAGetLastError()) ++ { ++ case WSAHOST_NOT_FOUND: break; ++ case WSATRY_AGAIN: return EAI_AGAIN; ++ case WSANO_RECOVERY: return EAI_FAIL; ++ case WSANO_DATA: return EAI_NODATA; ++ default: break; ++ } ++ return EAI_NONAME; ++} +--- wpcap/libpcap/WspiapiStrdup.c.w2k 2011-11-30 22:31:14.692287854 +0100 ++++ wpcap/libpcap/WspiapiStrdup.c 2011-11-30 22:31:14.692287854 +0100 +@@ -0,0 +1,23 @@ ++#ifndef WIN32_LEAN_AND_MEAN ++#define WIN32_LEAN_AND_MEAN ++#endif ++#undef __CRT__NO_INLINE ++#define __CRT__NO_INLINE ++#include <winsock2.h> ++#include <wspiapi.h> ++ ++char * WINAPI ++WspiapiStrdup (const char *pszString) ++{ ++ char *rstr; ++ size_t szlen; ++ ++ if(!pszString) ++ return NULL; ++ szlen = strlen(pszString) + 1; ++ rstr = (char *) WspiapiMalloc (szlen); ++ if (!rstr) ++ return NULL; ++ strcpy (rstr, pszString); ++ return rstr; ++} +--- wpcap/libpcap/wspiapi.h.w2k 2011-11-30 22:31:22.016411156 +0100 ++++ wpcap/libpcap/wspiapi.h 2011-11-30 22:31:22.016411156 +0100 +@@ -0,0 +1,207 @@ ++/** ++ * This file has no copyright assigned and is placed in the Public Domain. ++ * This file is part of the w64 mingw-runtime package. ++ * No warranty is given; refer to the file DISCLAIMER.PD within this package. ++ */ ++#ifndef _WSPIAPI_H_ ++#define _WSPIAPI_H_ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <malloc.h> ++#include <string.h> ++#include <ws2tcpip.h> ++ ++//#include <_mingw_print_push.h> ++ ++#define _WSPIAPI_STRCPY_S(_Dst,_Size,_Src) strcpy((_Dst),(_Src)) ++#define _WSPIAPI_STRCAT_S(_Dst,_Size,_Src) strcat((_Dst),(_Src)) ++#define _WSPIAPI_STRNCPY_S(_Dst,_Size,_Src,_Count) strncpy((_Dst),(_Src),(_Count)); (_Dst)[(_Size) - 1] = 0 ++#define _WSPIAPI_SPRINTF_S_1(_Dst,_Size,_Format,_Arg1) sprintf((_Dst),(_Format),(_Arg1)) ++ ++#ifndef _WSPIAPI_COUNTOF ++#ifndef __cplusplus ++#define _WSPIAPI_COUNTOF(_Array) (sizeof(_Array) / sizeof(_Array[0])) ++#else ++template <typename __CountofType,size_t _N> char (&__wspiapi_countof_helper(__CountofType (&_Array)[_N]))[_N]; ++#define _WSPIAPI_COUNTOF(_Array) sizeof(__wspiapi_countof_helper(_Array)) ++#endif ++#endif ++ ++#define WspiapiMalloc(tSize) calloc(1,(tSize)) ++#define WspiapiFree(p) free(p) ++#define WspiapiSwap(a,b,c) { (c) = (a); (a) = (b); (b) = (c); } ++#define getaddrinfo WspiapiGetAddrInfo ++#define getnameinfo WspiapiGetNameInfo ++#define freeaddrinfo WspiapiFreeAddrInfo ++ ++typedef int (WINAPI *WSPIAPI_PGETADDRINFO)(const char *nodename,const char *servname,const struct addrinfo *hints,struct addrinfo **res); ++typedef int (WINAPI *WSPIAPI_PGETNAMEINFO)(const struct sockaddr *sa,socklen_t salen,char *host,size_t hostlen,char *serv,size_t servlen,int flags); ++typedef void (WINAPI *WSPIAPI_PFREEADDRINFO)(struct addrinfo *ai); ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ typedef struct { ++ char const *pszName; ++ FARPROC pfAddress; ++ } WSPIAPI_FUNCTION; ++ ++#define WSPIAPI_FUNCTION_ARRAY { { "getaddrinfo",(FARPROC) WspiapiLegacyGetAddrInfo }, \ ++ { "getnameinfo",(FARPROC) WspiapiLegacyGetNameInfo }, \ ++ { "freeaddrinfo",(FARPROC) WspiapiLegacyFreeAddrInfo } } ++ ++ char *WINAPI WspiapiStrdup (const char *pszString); ++ WINBOOL WINAPI WspiapiParseV4Address (const char *pszAddress,PDWORD pdwAddress); ++ struct addrinfo * WINAPI WspiapiNewAddrInfo (int iSocketType,int iProtocol,WORD wPort,DWORD dwAddress); ++ int WINAPI WspiapiQueryDNS (const char *pszNodeName,int iSocketType,int iProtocol,WORD wPort,char pszAlias[NI_MAXHOST],struct addrinfo **pptResult); ++ int WINAPI WspiapiLookupNode (const char *pszNodeName,int iSocketType,int iProtocol,WORD wPort,WINBOOL bAI_CANONNAME,struct addrinfo **pptResult); ++ int WINAPI WspiapiClone (WORD wPort,struct addrinfo *ptResult); ++ void WINAPI WspiapiLegacyFreeAddrInfo (struct addrinfo *ptHead); ++ int WINAPI WspiapiLegacyGetAddrInfo(const char *pszNodeName,const char *pszServiceName,const struct addrinfo *ptHints,struct addrinfo **pptResult); ++ int WINAPI WspiapiLegacyGetNameInfo(const struct sockaddr *ptSocketAddress,socklen_t tSocketLength,char *pszNodeName,size_t tNodeLength,char *pszServiceName,size_t tServiceLength,int iFlags); ++ FARPROC WINAPI WspiapiLoad(WORD wFunction); ++ int WINAPI WspiapiGetAddrInfo(const char *nodename,const char *servname,const struct addrinfo *hints,struct addrinfo **res); ++ int WINAPI WspiapiGetNameInfo (const struct sockaddr *sa,socklen_t salen,char *host,size_t hostlen,char *serv,size_t servlen,int flags); ++ void WINAPI WspiapiFreeAddrInfo (struct addrinfo *ai); ++ ++#ifndef __CRT__NO_INLINE ++ __CRT_INLINE char * WINAPI ++ WspiapiStrdup (const char *pszString) ++ { ++ char *rstr; ++ size_t szlen; ++ ++ if(!pszString) ++ return NULL; ++ szlen = strlen(pszString) + 1; ++ rstr = (char *) WspiapiMalloc (szlen); ++ if (!rstr) ++ return NULL; ++ strcpy (rstr, pszString); ++ return rstr; ++ } ++ ++ __CRT_INLINE WINBOOL WINAPI ++ WspiapiParseV4Address (const char *pszAddress, PDWORD pdwAddress) ++ { ++ DWORD dwAddress = 0; ++ const char *h = NULL; ++ int cnt; ++ ++ for (cnt = 0,h = pszAddress; *h != 0; h++) ++ if (h[0] == '.') ++ cnt++; ++ if (cnt != 3) ++ return FALSE; ++ dwAddress = inet_addr (pszAddress); ++ if (dwAddress == INADDR_NONE) ++ return FALSE; ++ *pdwAddress = dwAddress; ++ return TRUE; ++ } ++ ++ __CRT_INLINE struct addrinfo * WINAPI ++ WspiapiNewAddrInfo (int iSocketType,int iProtocol, WORD wPort,DWORD dwAddress) ++ { ++ struct addrinfo *n; ++ struct sockaddr_in *pa; ++ ++ if ((n = (struct addrinfo *) WspiapiMalloc (sizeof (struct addrinfo))) == NULL) ++ return NULL; ++ if ((pa = (struct sockaddr_in *) WspiapiMalloc (sizeof(struct sockaddr_in))) == NULL) ++ { ++ WspiapiFree(n); ++ return NULL; ++ } ++ pa->sin_family = AF_INET; ++ pa->sin_port = wPort; ++ pa->sin_addr.s_addr = dwAddress; ++ n->ai_family = PF_INET; ++ n->ai_socktype = iSocketType; ++ n->ai_protocol = iProtocol; ++ n->ai_addrlen = sizeof (struct sockaddr_in); ++ n->ai_addr = (struct sockaddr *) pa; ++ return n; ++ } ++ ++ __CRT_INLINE int WINAPI ++ WspiapiLookupNode (const char *pszNodeName, int iSocketType, int iProtocol, WORD wPort, ++ WINBOOL bAI_CANONNAME, struct addrinfo **pptResult) ++ { ++ int err = 0, cntAlias = 0; ++ char name[NI_MAXHOST] = ""; ++ char alias[NI_MAXHOST] = ""; ++ char *pname = name, *palias = alias, *tmp = NULL; ++ ++ strncpy (pname, pszNodeName, NI_MAXHOST - 1); ++ pname[NI_MAXHOST - 1] = 0; ++ for (;;) ++ { ++ err = WspiapiQueryDNS (pszNodeName, iSocketType, iProtocol, wPort, palias, pptResult); ++ if (err) ++ break; ++ if (*pptResult) ++ break; ++ ++cntAlias; ++ if (strlen (palias) == 0 || !strcmp (pname, palias) || cntAlias == 16) ++ { ++ err = EAI_FAIL; ++ break; ++ } ++ WspiapiSwap(pname, palias, tmp); ++ } ++ if (!err && bAI_CANONNAME) ++ { ++ (*pptResult)->ai_canonname = WspiapiStrdup (palias); ++ if (!(*pptResult)->ai_canonname) ++ err = EAI_MEMORY; ++ } ++ return err; ++ } ++ ++ __CRT_INLINE int WINAPI ++ WspiapiClone (WORD wPort,struct addrinfo *ptResult) ++ { ++ struct addrinfo *p = NULL; ++ struct addrinfo *n = NULL; ++ ++ for (p = ptResult; p != NULL;) ++ { ++ n = WspiapiNewAddrInfo (SOCK_DGRAM, p->ai_protocol, wPort, ++ ((struct sockaddr_in *) p->ai_addr)->sin_addr.s_addr); ++ if (!n) ++ break; ++ n->ai_next = p->ai_next; ++ p->ai_next = n; ++ p = n->ai_next; ++ } ++ if (p != NULL) ++ return EAI_MEMORY; ++ return 0; ++ } ++ ++ __CRT_INLINE void WINAPI ++ WspiapiLegacyFreeAddrInfo (struct addrinfo *ptHead) ++ { ++ struct addrinfo *p; ++ ++ for (p = ptHead; p != NULL; p = ptHead) ++ { ++ if (p->ai_canonname) ++ WspiapiFree (p->ai_canonname); ++ if (p->ai_addr) ++ WspiapiFree (p->ai_addr); ++ ptHead = p->ai_next; ++ WspiapiFree (p); ++ } ++ } ++#endif /* !__CRT__NO_INLINE */ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++//#include <_mingw_print_pop.h> ++ ++#endif +--- wpcap/libpcap/sockutils.h.w2k 2011-11-30 22:31:36.148649395 +0100 ++++ wpcap/libpcap/sockutils.h 2011-11-30 22:32:21.197411498 +0100 +@@ -52,6 +52,7 @@ + #endif + #include <winsock2.h> + #include <ws2tcpip.h> ++#include <wspiapi.h> + #else + #include <stdio.h> + #include <string.h> /* for memset() */ +@@ -69,7 +70,7 @@ + /* MingW headers include this definition, but only for Windows XP and above. + MSDN states that this function is available for most versions on Windows. + */ +-#if ((defined(__MINGW32__)) && (_WIN32_WINNT < 0x0501)) ++#if 0 && ((defined(__MINGW32__)) && (_WIN32_WINNT < 0x0501)) + int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD, + char*,DWORD,int); + #endif +--- wpcap/PRJ/GNUmakefile.w2k 2011-11-30 22:52:59.541092745 +0100 ++++ wpcap/PRJ/GNUmakefile 2011-11-30 22:54:11.127259152 +0100 +@@ -62,7 +62,20 @@ + ../libpcap/sockutils.o \ + ../libpcap/Win32/Src/gai_strerror.o \ + ../libpcap/pcap-tc.o \ +- ../Win32-Extensions/Win32-Extensions.o ++ ../Win32-Extensions/Win32-Extensions.o \ ++ ../libpcap/WspiapiClone.o \ ++ ../libpcap/WspiapiFreeAddrInfo.o \ ++ ../libpcap/WspiapiGetAddrInfo.o \ ++ ../libpcap/WspiapiGetNameInfo.o \ ++ ../libpcap/WspiapiLegacyFreeAddrInfo.o \ ++ ../libpcap/WspiapiLegacyGetAddrInfo.o \ ++ ../libpcap/WspiapiLegacyGetNameInfo.o \ ++ ../libpcap/WspiapiLoad.o \ ++ ../libpcap/WspiapiLookupNode.o \ ++ ../libpcap/WspiapiNewAddrInfo.o \ ++ ../libpcap/WspiapiParseV4Address.o \ ++ ../libpcap/WspiapiQueryDNS.o \ ++ ../libpcap/WspiapiStrdup.o + + main: ${OBJS} + @${RM} -rf ../lib/

1 0

[claws-mail] fix changelog V-R format ;)
by Michael Schwendt 30 Nov '11

30 Nov '11

commit f923e02e6501d034ca91f548d673d86d89b8711a Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Wed Nov 30 22:42:04 2011 +0100 fix changelog V-R format ;) claws-mail.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/claws-mail.spec b/claws-mail.spec index 015e0b8..4ae972c 100644 --- a/claws-mail.spec +++ b/claws-mail.spec @@ -235,7 +235,7 @@ fi %{_libdir}/claws-mail/plugins/smime.deps %changelog -* Wed Nov 30 2011 Michael Schwendt <mschwendt(a)fedoraproject.org> - 3.7.10-7 +* Wed Nov 30 2011 Michael Schwendt <mschwendt(a)fedoraproject.org> - 3.7.10-7 - merge fix from 3.7.10cvs47 for odd mimeview_start_drag crash (#748384) - include built/installed manual and not its XML source @@ -245,7 +245,7 @@ fi - drop ancient Obsoletes/Provides - drop old spec sections not needed anymore -* Fri Nov 25 2011 Michael Schwendt <mschwendt(a)fedoraproject.org> - 3.7.10-6 +* Fri Nov 25 2011 Michael Schwendt <mschwendt(a)fedoraproject.org> - 3.7.10-6 - fix for new glib2 where only glib.h must be included (#755308)

1 0

[claws-mail-plugins] 3.7.10-10 don't build geolocation plugin since we can't mix gtk2 and gtk3 (#758173, #662800) remove
by Michael Schwendt 30 Nov '11

30 Nov '11

commit f8abfbdea41f8b4ceb3e3641fea0e8b1fff50fcf Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Wed Nov 30 22:40:54 2011 +0100 3.7.10-10 don't build geolocation plugin since we can't mix gtk2 and gtk3 (#758173, #662800) remove libchamplain* pkg-config hacks for geolocation plugin (it supports 0.4 to 0.8 only) merge newer vcalendar plugin to fix a crash (#742249) drop ancient Obsoletes/Provides drop old spec sections not needed anymore .gitignore | 1 + claws-mail-plugins-gdata-0.9.0.patch | 131 ---------- claws-mail-plugins-geolocation-champlain-0.9.patch | 13 - claws-mail-plugins.spec | 262 ++++++++------------ sources | 1 + 5 files changed, 108 insertions(+), 300 deletions(-) --- diff --git a/.gitignore b/.gitignore index f8881db..00dab0f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ claws-mail-extra-plugins-3.7.6.tar.bz2 /claws-mail-extra-plugins-3.7.10.tar.bz2 /gdata-0.2cvs11.tar.bz2 /fancy-0.9.14cvs1.tar.bz2 +/vcalendar-2.0.11cvs11.tar.gz diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec index aff3ab0..f6f736a 100644 --- a/claws-mail-plugins.spec +++ b/claws-mail-plugins.spec @@ -1,4 +1,5 @@ %global pluginapi 3.7.10.0 + # define plugin version %global acpinotifier 1.0.25 %global addresskeeper 1.0.4 @@ -20,12 +21,12 @@ %global rssyl 0.31 %global spamreport 0.3.14 %global tnef 0.3.11 -%global vcalendar 2.0.11 +%global vcalendar 2.0.11cvs11 Name: claws-mail-plugins Version: 3.7.10 -Release: 9%{?dist} -Summary: Additional plugins for claws-mail +Release: 10%{?dist} +Summary: Additional plugins for Claws Mail Group: Applications/Internet License: GPLv2 and GPLv3+ and MIT @@ -33,12 +34,10 @@ URL: http://claws-mail.org Source0: http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{… Source1: gdata-0.2cvs11.tar.bz2 Source2: fancy-0.9.14cvs1.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source3: vcalendar-2.0.11cvs11.tar.gz Patch0: claws-mail-extra-plugins-3.7.10-glib2-include.patch -Patch1: claws-mail-plugins-geolocation-champlain-0.9.patch - BuildRequires: claws-mail-devel >= %{version} BuildRequires: glib2-devel BuildRequires: gtk2-devel @@ -101,7 +100,7 @@ Requires: %{name}-tnef = %{version}-%{release} %endif Requires: %{name}-vcalendar = %{version}-%{release} -# and the ones from main claws-mail-package... +# and the ones from main claws-mail package... %if !0%{?rhel} Requires: %{name}-dillo %endif @@ -110,27 +109,23 @@ Requires: %{name}-pgp Requires: %{name}-bogofilter Requires: %{name}-smime -# Dec 2006 -Obsoletes: sylpheed-claws-plugins <= 2.6.0 -Provides: sylpheed-claws-plugins = %{version}-%{release} %description -Additional plugins for claws-mail +Additional plugins for Claws Mail. + %package acpi-notifier -Summary: ACPI notification plugin for claws-mail +Summary: ACPI notification plugin for Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-acpi-notifier = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-acpi-notifier <= 2.6.0 %description acpi-notifier Enables mail notification via LEDs on some laptops. Options can be found on the 'Plugins/Acpi Notifier' page of the preferences. + %package address-keeper -Summary: Never forget a typed address +Summary: Never forget a typed address in Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi @@ -139,16 +134,18 @@ This plugin allows saving outgoing addresses to a designated folder in the address book. Addresses are saved only if not found in the address book to avoid unwanted duplicates. + %package archive -Summary: Archiving features for claws-mail +Summary: Archiving features for Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi %description archive %{summary} + %package attachwarner -Summary: Attachment warner plugin for claws-mail +Summary: Attachment warner plugin for Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi @@ -158,31 +155,28 @@ body but without attaching any files to the message. %package att-remover -Summary: Attachments remover plugin for claws-mail +Summary: Attachments remover plugin for Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-att-remover = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-att-remover <= 2.6.0 %description att-remover Enables the removal of attachments from emails. When right-clicking a message, choose 'Remove attachments' from the sub-menu. + %package bsfilter -Summary: Bayesian spam filtering for claws-mail +Summary: Bayesian spam filtering for Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi %description bsfilter -Bayesian spam filtering for claws-mail using Bsfilter. +Bayesian spam filtering for Claws Mail using Bsfilter. + %package clamd -Summary: Use Clam AntiVirus to scan all messages +Summary: Use Clam AntiVirus to scan messages in Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# was dropped as of 3.3.1 -> use this as 'successor' -Provides: claws-mail-plugins-clamav = %{version}-%{release} %description clamd This plugin uses Clam AntiVirus to scan all messages that are @@ -191,26 +185,26 @@ When a message attachment is found to contain a virus it can be deleted or saved in a specially designated folder. Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus. + %package fancy -Summary: Render HTML emails via WebKit +Summary: Display HTML emails in Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi %description fancy This plugin renders HTML email via the GTK+ port of the WebKit library. + %package fetchinfo -Summary: Inserts headers containing some download information +Summary: Modify headers of downloaded messages in Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-fetchinfo = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-fetchinfo <= 2.6.0 %description fetchinfo This plugin inserts headers containing some download information: UIDL, Sylpheeds account name, POP server, user ID and retrieval time. + %if !0%{?rhel} %package gdata Summary: Access to GData (Google services) for Claws Mail @@ -224,9 +218,10 @@ The only currently implemented feature is inclusion of Google contacts into the address completion. %endif + %if 0%{?fedora} >= 12 %package geolocation -Summary: Provide GeoLocation functionality +Summary: Provide GeoLocation functionality in Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi @@ -234,15 +229,12 @@ Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi This plugin provides GeoLocation functionality %endif + %if 0%{?fedora} < 12 %package gtkhtml2-viewer -Summary: GTK Html Viewer +Summary: GTK Html Viewer for Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-gtkhtml2-viewer = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-gtkhtml2-viewer <= 2.6.0 - %description gtkhtml2-viewer Renders HTML mail using the gtkhtml2 rendering widget. The option, 'Do not load @@ -250,89 +242,80 @@ remote links in mails' can be found on the 'Plugins/GtkHtml2 Viewer' page of the preferences. %endif + %package mailmbox -Summary: Support for mailboxes in mbox format +Summary: Add support for mailboxes in mbox format to Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-mailmbox = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-mailmbox <= 2.6.0 - %description mailmbox This plugin provides direct support for mailboxes in mbox format. + %package newmail -Summary: Write a message header summary to a log file +Summary: Make Claws Mail write a message header summary to a file Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-newmail = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-newmail <= 2.6.0 %description newmail -Write a message header summary to a log file (defaults to ~/Mail/NewLog) an +Write a message header summary to a log file (defaults to ~/Mail/NewLog) on arrival of new mail *after* sorting. + %package notification -Summary: New mail notifications +Summary: Various ways to notify about new messages in Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-notification = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-notification <= 2.6.0 %description notification This plugin collects various ways to notify the user of new (and possibly unread) mail. Currently, a pop-up and a mail banner are implemented. + %package perl -Summary: Extended filtering engine +Summary: Perl based extended filtering engine for Claws Mail Group: Applications/Internet Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-perl = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-perl <= 2.6.0 %description perl This plugin provides an extended filtering engine for the email client -claws-mail. It allows for the use of full perl power in email filters. +Claws Mail. It allows for the use of full perl power in email filters. + %package python -Summary: Python scripting access to claws-mail +Summary: Python scripting access to Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi %description python This plugin offers a Python scripting access to Claws Mail. Python code can be -entered interactively into an embedded Python console, or stored in scripts +entered interactively into an embedded Python console or stored in scripts under ~/.claws-mail/python-scripts. The scripts are then accessible via the menu of the main window. + %package rssyl -Summary: RSS plugin for claws-mail +Summary: RSS plugin for Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-rssyl = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-rssyl <= 2.6.0 %description rssyl -Allows you to read your favorite RSS news feeds in Claws. RSS 1.0, +Allows you to read your favorite RSS news feeds in Claws Mail. RSS 1.0, 2.0 and Atom feeds are currently supported. %package spam-report -Summary: Report spam mail to various places +Summary: Report spam mail to various places with Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi %description spam-report -This plugin can report spam mails to various places. +This plugin for Claws Mail can report spam mail to various places. + %if !0%{?rhel} %package tnef -Summary: Tnef message parsing +Summary: TNEF message parsing for Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi @@ -340,19 +323,18 @@ Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi This plugin allows reading of application/ms-tnef attachments. %endif + %package vcalendar -Summary: Handling for vCalendar messages +Summary: Handling of vCalendar messages in Claws Mail Group: Applications/Internet Requires: claws-mail(plugin-api)%{?_isa} = %pluginapi -# Dec 2006 -Provides: sylpheed-claws-plugins-vcalendar = %{version}-%{release} -Obsoletes: sylpheed-claws-plugins-vcalendar <= 2.6.0 %description vcalendar This plugin enables vCalendar message handling like that produced by Evolution or Outlook. It also supports subscribing to remote webCal feeds, and exporting of your meetings or all your calendars. + %prep %setup -q -n claws-mail-extra-plugins-%{version} %patch0 -p1 -b .glib2-include @@ -361,39 +343,25 @@ exporting of your meetings or all your calendars. SOURCEAPI=$(grep -A 1 VERSION_NUMERIC %{_includedir}/claws-mail/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");') [ "%pluginapi" == "$SOURCEAPI" ] || exit -1 -# hack - Fedora 14 has libchamplain-gtk >= 0.6 and wouldn't even build -%if 0%{?fedora} == 14 -sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.6!g' geolocation_plugin-%{geolocation}/configure -%endif - -%if 0%{?fedora} == 15 -sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.10!g' geolocation_plugin-%{geolocation}/configure -sed -i -e 's!clutter-gtk-0.10!clutter-gtk-1.0!g' geolocation_plugin-%{geolocation}/configure -pushd geolocation_plugin-%{geolocation} -%patch1 -p2 -b .geolocation_champlain-0.10 -popd -%endif - -%if 0%{?fedora} > 15 -sed -i -e 's!champlain-gtk-0.4!champlain-gtk-0.12!g' geolocation_plugin-%{geolocation}/configure -sed -i -e 's!clutter-gtk-0.10!clutter-gtk-1.0!g' geolocation_plugin-%{geolocation}/configure -pushd geolocation_plugin-%{geolocation} -%patch1 -p2 -b .geolocation_champlain-0.10 -popd -%endif - # fix perms -pushd vcalendar-%{vcalendar} +pushd vcalendar* chmod 0644 COPYING README AUTHORS popd # extract cvs version of gdata for newer libgdata support -rm -fr gdata_plugin-0.2 +rm -r gdata_plugin-0.2 tar -xjvf %{SOURCE1} +mv gdata gdata_plugin-%{gdata} # extract cvs version of fancy for new webkit -rm -fr fancy-0.9.14 +rm -r fancy-0.9.14 tar -xjvf %{SOURCE2} +mv fancy fancy-%{fancy} + +# extract cvs version of vcalendar plugin for crash-fix +rm -r vcalendar-2.0.11 +tar -xvf %{SOURCE3} + %build #acpi_notifier @@ -432,8 +400,7 @@ cd ../clamd-%{clamd} %{__make} %{?_smp_mflags} # fancy -#cd ../fancy-%{fancy} -cd ../fancy +cd ../fancy-%{fancy} autoreconf -fi %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} @@ -445,22 +412,27 @@ cd ../fetchinfo-plugin-%{fetchinfo} # gdata %if !0%{?rhel} -#cd ../gdata_plugin-%{gdata} -cd ../gdata +cd ../gdata_plugin-%{gdata} autoreconf -fi %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} %endif -%if 0%{?fedora} >= 12 #geolocation-plugin +%if 0%{?fedora} >= 12 cd ../geolocation_plugin-%{geolocation} -%configure --disable-static --disable-dependency-tracking -%{__make} %{?_smp_mflags} +# +# Cannot build this with libchamplain-gtk using gtk3 and +# Claws Mail using gtk2 (bugzilla 758173 and 662800). +# Reactivating via sections 'build', 'install' and 'files'. +# +echo "Currently not built as Claws Mail still uses GTK+ 2." > README.Fedora +#configure --disable-static --disable-dependency-tracking +#%{__make} %{?_smp_mflags} %endif -%if 0%{?fedora} < 16 #gtkhtml2-viewer +%if 0%{?fedora} < 16 cd ../gtkhtml2_viewer-%{gtkhtml2viewer} %configure --disable-static --disable-dependency-tracking --disable-rpath %{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool @@ -505,8 +477,8 @@ cd ../spam_report-%{spamreport} %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} -%if !0%{?rhel} #tnef +%if !0%{?rhel} cd ../tnef_parse-%{tnef} OLDCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I%{_includedir}/libytnef" \ @@ -520,9 +492,8 @@ cd ../vcalendar-%{vcalendar} %configure --disable-static --disable-dependency-tracking %{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool -%install -rm -rf $RPM_BUILD_ROOT +%install # acpi_notifier cd acpi_notifier-%{acpinotifier} %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ @@ -565,8 +536,7 @@ cd - %find_lang clamd #fancy -#cd fancy-%{fancy} -cd fancy +cd fancy-%{fancy} %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ cd - %find_lang fancy @@ -578,8 +548,7 @@ cd - # gdata %if !0%{?rhel} -cd gdata -#cd gdata_plugin-%{gdata} +cd gdata_plugin-%{gdata} %{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ cd - %find_lang gdata_plugin @@ -588,9 +557,10 @@ cd - %if 0%{?fedora} >= 12 #geolocation-plugin cd geolocation_plugin-%{geolocation} -%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ +#%{__make} install DESTDIR=$RPM_BUILD_ROOT CLAWS_MAIL_PLUGINDIR=%{_libdir}/claws-mail/plugins/ cd - -%find_lang geolocation_plugin +#%find_lang geolocation_plugin +touch geolocation_plugin.lang %endif %if 0%{?fedora} < 16 @@ -659,15 +629,11 @@ cd - find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %doc RELEASE_NOTES %files acpi-notifier -f acpi_notifier.lang -%defattr(-,root,root,-) %doc acpi_notifier-%{acpinotifier}/ChangeLog %doc acpi_notifier-%{acpinotifier}/COPYING %doc acpi_notifier-%{acpinotifier}/NEWS @@ -676,7 +642,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/acpi_notifier* %files archive -f archive.lang -%defattr(-,root,root,-) %doc archive-%{archive}/ABOUT-NLS %doc archive-%{archive}/AUTHORS %doc archive-%{archive}/ChangeLog @@ -690,7 +655,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/claws-mail/plugins/archive/ %files attachwarner -f attachwarner.lang -%defattr(-,root,root,-) %{_libdir}/claws-mail/plugins/attachwarner* %doc attachwarner-%{attachwarner}/AUTHORS %doc attachwarner-%{attachwarner}/ChangeLog @@ -699,7 +663,6 @@ rm -rf $RPM_BUILD_ROOT %doc attachwarner-%{attachwarner}/TODO %files address-keeper -f address_keeper.lang -%defattr(-,root,root,-) %doc address_keeper-%{addresskeeper}/AUTHORS %doc address_keeper-%{addresskeeper}/ChangeLog %doc address_keeper-%{addresskeeper}/COPYING @@ -709,7 +672,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/address_keeper* %files att-remover -%defattr(-,root,root,-) %doc att_remover-%{attremover}/AUTHORS %doc att_remover-%{attremover}/ChangeLog %doc att_remover-%{attremover}/COPYING @@ -718,7 +680,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/att_remover* %files bsfilter -f bsfilter_plugin.lang -%defattr(-,root,root,-) %doc bsfilter_plugin-%{bsfilter}/AUTHORS %doc bsfilter_plugin-%{bsfilter}/ChangeLog %doc bsfilter_plugin-%{bsfilter}/COPYING @@ -726,7 +687,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/bsfilter* %files clamd -f clamd.lang -%defattr(-,root,root,-) %doc clamd-%{clamd}/AUTHORS %doc clamd-%{clamd}/ChangeLog %doc clamd-%{clamd}/COPYING @@ -735,19 +695,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/clamd* %files fancy -f fancy.lang -%defattr(-,root,root,-) -#%doc fancy-%{fancy}/COPYING -#%doc fancy-%{fancy}/AUTHORS -#%doc fancy-%{fancy}/README -#%doc fancy-%{fancy}/ChangeLog -%doc fancy/COPYING -%doc fancy/AUTHORS -%doc fancy/README -%doc fancy/ChangeLog +%doc fancy-%{fancy}/COPYING +%doc fancy-%{fancy}/AUTHORS +%doc fancy-%{fancy}/README +%doc fancy-%{fancy}/ChangeLog %{_libdir}/claws-mail/plugins/fancy* %files fetchinfo -%defattr(-,root,root,-) %doc fetchinfo-plugin-%{fetchinfo}/ChangeLog %doc fetchinfo-plugin-%{fetchinfo}/COPYING %doc fetchinfo-plugin-%{fetchinfo}/README @@ -755,37 +709,31 @@ rm -rf $RPM_BUILD_ROOT %if !0%{?rhel} %files gdata -f gdata_plugin.lang -%defattr(-,root,root,-) -#%doc gdata_plugin-%{gdata}/AUTHORS -#%doc gdata_plugin-%{gdata}/ChangeLog -#%doc gdata_plugin-%{gdata}/COPYING -#%doc gdata_plugin-%{gdata}/README -%doc gdata/AUTHORS -%doc gdata/ChangeLog -%doc gdata/COPYING -%doc gdata/README +%doc gdata_plugin-%{gdata}/AUTHORS +%doc gdata_plugin-%{gdata}/ChangeLog +%doc gdata_plugin-%{gdata}/COPYING +%doc gdata_plugin-%{gdata}/README %{_libdir}/claws-mail/plugins/gdata* %endif %if 0%{?fedora} >= 12 %files geolocation -f geolocation_plugin.lang -%defattr(-,root,root,-) -%doc geolocation_plugin-%{geolocation}/ChangeLog -%doc geolocation_plugin-%{geolocation}/COPYING -%doc geolocation_plugin-%{geolocation}/README -%{_libdir}/claws-mail/plugins/geolocation* +# temporarily included only! +%doc geolocation_plugin-%{geolocation}/README.Fedora +#%doc geolocation_plugin-%{geolocation}/ChangeLog +#%doc geolocation_plugin-%{geolocation}/COPYING +#%doc geolocation_plugin-%{geolocation}/README +#%{_libdir}/claws-mail/plugins/geolocation* %endif %if 0%{?fedora} < 16 %files gtkhtml2-viewer -f gtkhtml2_viewer.lang -%defattr(-,root,root,-) %doc gtkhtml2_viewer-%{gtkhtml2viewer}/AUTHORS %doc gtkhtml2_viewer-%{gtkhtml2viewer}/COPYING %{_libdir}/claws-mail/plugins/gtkhtml2_viewer* %endif %files mailmbox -%defattr(-,root,root,-) %doc mailmbox-%{mailmbox}/AUTHORS %doc mailmbox-%{mailmbox}/ChangeLog %doc mailmbox-%{mailmbox}/COPYING @@ -793,7 +741,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/mailmbox* %files newmail -%defattr(-,root,root,-) %doc newmail-%{newmail}/AUTHORS %doc newmail-%{newmail}/ChangeLog %doc newmail-%{newmail}/COPYING @@ -802,7 +749,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/newmail.so %files notification -f notification_plugin.lang -%defattr(-,root,root,-) %doc notification_plugin-%{notification}/AUTHORS %doc notification_plugin-%{notification}/ChangeLog %doc notification_plugin-%{notification}/COPYING @@ -811,7 +757,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/notification_plugin %files perl -%defattr(-,root,root,-) %doc perl_plugin-%{perl}/AUTHORS %doc perl_plugin-%{perl}/ChangeLog %doc perl_plugin-%{perl}/COPYING @@ -821,7 +766,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/perl_plugin.so %files python -f python_plugin.lang -%defattr(-,root,root,-) %doc python_plugin-%{python}/AUTHORS %doc python_plugin-%{python}/ChangeLog %doc python_plugin-%{python}/COPYING @@ -830,20 +774,17 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/claws-mail/plugins/python_plugin* %files rssyl -f rssyl.lang -%defattr(-,root,root,-) %doc rssyl-%{rssyl}/AUTHORS %doc rssyl-%{rssyl}/ChangeLog %doc rssyl-%{rssyl}/COPYING %{_libdir}/claws-mail/plugins/rssyl* %files spam-report -f spam_report.lang -%defattr(-,root,root,-) %doc spam_report-%{spamreport}/{AUTHORS,ChangeLog,COPYING,NEWS,README} %{_libdir}/claws-mail/plugins/spamreport.so %if !0%{?rhel} %files tnef -f tnef_parse.lang -%defattr(-,root,root,-) %doc tnef_parse-%{tnef}/AUTHORS %doc tnef_parse-%{tnef}/ChangeLog %doc tnef_parse-%{tnef}/COPYING @@ -852,7 +793,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files vcalendar -f vcalendar.lang -%defattr(-,root,root,-) %doc vcalendar-%{vcalendar}/AUTHORS %doc vcalendar-%{vcalendar}/ChangeLog %doc vcalendar-%{vcalendar}/COPYING @@ -863,6 +803,16 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/claws-mail/plugins/vcalendar/ %changelog +* Wed Nov 30 2011 Michael Schwendt <mschwendt(a)fedoraproject.org> +- 3.7.10-10 +- don't build geolocation plugin since we can't mix gtk2 and gtk3 + (#758173, #662800) +- remove libchamplain* pkg-config hacks for geolocation plugin + (it supports 0.4 to 0.8 only) +- merge newer vcalendar plugin to fix a crash (#742249) +- drop ancient Obsoletes/Provides +- drop old spec sections not needed anymore + * Fri Nov 25 2011 Michael Schwendt <mschwendt(a)fedoraproject.org> - 3.7.10-9 - fix missing %%doc files in -perl subpackage (#707662) diff --git a/sources b/sources index 0e4f957..cda23e2 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ fe782b2d4762c9727e22c1bb7979f7d6 claws-mail-extra-plugins-3.7.10.tar.bz2 d3d794962ef3d259d3400db6f116dd17 gdata-0.2cvs11.tar.bz2 ed7f91eff46cedcbb0307407912e8bfc fancy-0.9.14cvs1.tar.bz2 +5f446458cb7513ae03582a8fa980517a vcalendar-2.0.11cvs11.tar.gz

1 0

File vcalendar-2.0.11cvs11.tar.gz uploaded to lookaside cache by mschwendt
by Michael Schwendt 30 Nov '11

30 Nov '11

A file has been added to the lookaside cache for claws-mail-plugins: 5f446458cb7513ae03582a8fa980517a vcalendar-2.0.11cvs11.tar.gz

1 0

[kdesdk/f16] lokalize: Requires: -strigi-analyzer (kde#287777)
by Rex Dieter 30 Nov '11

30 Nov '11

commit a10aa420204d96a41b9dbc24eb27c59a7f8e77fb Author: Rex Dieter <rdieter(a)fedoraproject.org> Date: Wed Nov 30 15:32:58 2011 -0600 lokalize: Requires: -strigi-analyzer (kde#287777) kdesdk.spec | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) --- diff --git a/kdesdk.spec b/kdesdk.spec index d902c52..37cac31 100644 --- a/kdesdk.spec +++ b/kdesdk.spec @@ -1,7 +1,7 @@ Name: kdesdk Summary: The KDE Software Development Kit (SDK) Version: 4.7.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.kde.org/ @@ -181,6 +181,7 @@ Requires: %{name}-common = %{version}-%{release} Summary: Computer-aided translation system Provides: lokalize = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-strigi-analyzer = %{version}-%{release} Requires: kross(python) %description lokalize %{summary}, focusing on productivity and performance. @@ -683,6 +684,9 @@ fi %changelog +* Wed Nov 30 2011 Rex Dieter <rdieter(a)fedoraproject.org> 4.7.3-2 +- lokalize: Requires: -strigi-analyzer (kde#287777) + * Sat Oct 29 2011 Rex Dieter <rdieter(a)fedoraproject.org> 4.7.3-1 - 4.7.3 - pkgconfig-style deps

1 0

[kdesdk] lokalize: Requires: -strigi-analyzer (kde#287777)
by Rex Dieter 30 Nov '11

30 Nov '11

commit b6dfc47f722ca7f5d26f68bd14cb544470b6bef9 Author: Rex Dieter <rdieter(a)fedoraproject.org> Date: Wed Nov 30 15:30:06 2011 -0600 lokalize: Requires: -strigi-analyzer (kde#287777) kdesdk.spec | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) --- diff --git a/kdesdk.spec b/kdesdk.spec index 3feacd2..2166894 100644 --- a/kdesdk.spec +++ b/kdesdk.spec @@ -1,7 +1,7 @@ Name: kdesdk Summary: The KDE Software Development Kit (SDK) Version: 4.7.80 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.kde.org/ @@ -178,6 +178,7 @@ Requires: %{name}-common = %{version}-%{release} Summary: Computer-aided translation system Provides: lokalize = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-strigi-analyzer = %{version}-%{release} Requires: kross(python) %description lokalize %{summary}, focusing on productivity and performance. @@ -682,6 +683,9 @@ fi %changelog +* Wed Nov 30 2011 Rex Dieter <rdieter(a)fedoraproject.org> 4.7.80-2 +- lokalize: Requires: -strigi-analyzer (kde#287777) + * Fri Nov 25 2011 Radek Novacek <rnovacek(a)redhat.com> 4.7.80-1 - 4.7.80 (beta 1) - Drop patch for fixing virtual inheritance of QObject (fixed upstream)

1 0

[aeolus-configserver/f16] Initial import (#756179)
by Joseph J. VLcek 30 Nov '11

30 Nov '11

Summary of changes: 225df58... Initial import (#756179) (*) (*) This commit already existed in another branch; no separate mail sent

1 0

← Newer
1
2
3
4
5
6
7
8
...
1103
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits November 2011