rpms/vdr-wapd/devel vdr-wapd-0.9-headers.patch, NONE, 1.1 vdr-wapd-0.9-i18n.patch, NONE, 1.1 vdr-wapd-0.9-signedness.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-wapd.spec, 1.3, 1.4 vdr-wapd-0.8-1338i18n.patch, 1.1, NONE vdr-wapd-0.8-1341.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Jan 21 22:48:56 UTC 2008
Author: scop
Update of /cvs/pkgs/rpms/vdr-wapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27243
Modified Files:
.cvsignore sources vdr-wapd.spec
Added Files:
vdr-wapd-0.9-headers.patch vdr-wapd-0.9-i18n.patch
vdr-wapd-0.9-signedness.patch
Removed Files:
vdr-wapd-0.8-1338i18n.patch vdr-wapd-0.8-1341.patch
Log Message:
* Tue Jan 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.9-1
- 0.9, license changed to GPLv2+.
- Patch to improve translations.
- Patch to fix port conversion in accepted/denied syslog messages.
- Patch to fix missing HTTP headers on access denied responses.
vdr-wapd-0.9-headers.patch:
--- NEW FILE vdr-wapd-0.9-headers.patch ---
diff -up wapd-0.9/access.c~ wapd-0.9/access.c
--- wapd-0.9/access.c~ 2008-01-13 14:41:21.000000000 +0200
+++ wapd-0.9/access.c 2008-01-22 00:16:13.000000000 +0200
@@ -212,7 +212,11 @@ int cWapSocket::Accept(void)
if (newsock > 0) {
bool accepted = WapHosts.Acceptable(clientname.sin_addr.s_addr);
if (!accepted) {
- const char *s = "Access denied!\n";
+ const char *s =
+ "HTTP/1.0 403 Forbidden\n"
+ "Server: VDR WAPD\n"
+ "Content-Type: text/plain\n\n"
+ "Access denied!\n";
write(newsock, s, strlen(s));
close(newsock);
newsock = -1;
vdr-wapd-0.9-i18n.patch:
--- NEW FILE vdr-wapd-0.9-i18n.patch ---
diff -up wapd-0.9/i18n.c~ wapd-0.9/i18n.c
--- wapd-0.9/i18n.c~ 2008-01-15 10:27:29.000000000 +0200
+++ wapd-0.9/i18n.c 2008-01-22 00:30:12.000000000 +0200
@@ -140,7 +140,7 @@ const tI18nPhrase Phrases[] = {
"",
"Pas de résumé defini.",
"",
- "Yhteenvetoa ei saatavilla.",
+ "Kuvausta ei saatavilla.",
"",
"",
"",
@@ -497,7 +497,7 @@ const tI18nPhrase Phrases[] = {
"",
"Image",
"",
- "",
+ "Kuva",
"",
"",
"",
@@ -518,7 +518,7 @@ const tI18nPhrase Phrases[] = {
"",
"Pas de image disponible.",
"",
- "",
+ "Kuva ei saatavilla.",
"",
"",
"",
@@ -539,7 +539,7 @@ const tI18nPhrase Phrases[] = {
"",
"Image trop grand.",
"",
- "",
+ "Kuvan koko on liian suuri.",
"",
"",
"",
diff -up wapd-0.9/server.c~ wapd-0.9/server.c
--- wapd-0.9/server.c~ 2008-01-19 16:41:46.000000000 +0200
+++ wapd-0.9/server.c 2008-01-22 00:30:39.000000000 +0200
@@ -963,9 +963,9 @@ void cWapServer::PageGrabImage(void)
FlushBuffer(size);
return;
} else
- ReplyBuffer("Image size too big.");
+ ReplyBuffer(wmltr("Image size too big."));
} else
- ReplyBuffer("No image available.");
+ ReplyBuffer(wmltr("No image available."));
ReplyBuffer(WML_A_KEY("", URI_MAIN, "0", "%s") " ", wmltr("VDR"));
ReplyBuffer(WML_END());
Header(200, "OK", MIME_TYPE, SERVER_NAME);
vdr-wapd-0.9-signedness.patch:
--- NEW FILE vdr-wapd-0.9-signedness.patch ---
diff -up wapd-0.9/access.c~ wapd-0.9/access.c
--- wapd-0.9/access.c~ 2008-01-13 14:41:21.000000000 +0200
+++ wapd-0.9/access.c 2008-01-22 00:14:46.000000000 +0200
@@ -217,7 +217,7 @@ int cWapSocket::Accept(void)
close(newsock);
newsock = -1;
}
- isyslog("WAPD: connect from %s, port %hd - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
+ isyslog("WAPD: connect from %s, port %hu - %s", inet_ntoa(clientname.sin_addr), ntohs(clientname.sin_port), accepted ? "accepted" : "DENIED");
} else if (errno != EINTR && errno != EAGAIN)
LOG_ERROR;
return newsock;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-wapd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 27 Mar 2007 18:42:24 -0000 1.2
+++ .cvsignore 21 Jan 2008 22:48:13 -0000 1.3
@@ -1 +1 @@
-vdr-wapd-0.8.tgz
+vdr-wapd-0.9.tgz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-wapd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Mar 2007 18:42:24 -0000 1.2
+++ sources 21 Jan 2008 22:48:13 -0000 1.3
@@ -1 +1 @@
-2e83cd23940a8692e7f07a0d181acb70 vdr-wapd-0.8.tgz
+31c193e247ead08e8f5fb76c1eb3d0ee vdr-wapd-0.9.tgz
Index: vdr-wapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-wapd/devel/vdr-wapd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vdr-wapd.spec 22 Aug 2007 17:50:36 -0000 1.3
+++ vdr-wapd.spec 21 Jan 2008 22:48:13 -0000 1.4
@@ -7,23 +7,24 @@
%define vdr_user %(vdr-config --user 2>/dev/null || echo ERROR)
Name: vdr-%{pname}
-Version: 0.8
-Release: 18%{?dist}
+Version: 0.9
+Release: 1%{?dist}
Summary: WAP remote control interface for VDR
Group: Applications/Multimedia
-License: GPL+
+License: GPLv2+
URL: http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html
Source0: http://www.heiligenmann.de/vdr/download/%{name}-%{version}.tgz
Source1: %{name}-waphosts
Source2: %{name}-wapaccess
Source3: %{name}-proxy.conf
Source4: %{name}.conf
-Patch0: %{name}-0.8-1338i18n.patch
-Patch1: %{name}-0.8-1341.patch
+Patch0: %{name}-0.9-i18n.patch
+Patch1: %{name}-0.9-signedness.patch
+Patch2: %{name}-0.9-headers.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: vdr-devel >= 1.3.47
+BuildRequires: vdr-devel >= 1.4.4
BuildRequires: gawk
Requires: vdr(abi) = %{apiver}
@@ -35,11 +36,10 @@
%prep
%setup -q -n %{pname}-%{version}
%patch0 -p1
-%patch1
+%patch1 -p1
+%patch2 -p1
iconv -f iso-8859-1 -t utf-8 HISTORY > HISTORY.utf8 ; mv HISTORY.utf8 HISTORY
sed -i -e 's|/video/plugins|%{configdir}/plugins|' README
-sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
-sed -i -e s/VDRVERSION/APIVERSION/g Makefile
install -pm 644 %{SOURCE3} %{name}-httpd.conf
@@ -65,7 +65,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING HISTORY README %{name}-httpd.conf
+%doc gpl-2.0.txt HISTORY README %{name}-httpd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%{_bindir}/wappasswd
%{plugindir}/libvdr-%{pname}.so.%{apiver}
@@ -75,6 +75,12 @@
%changelog
+* Tue Jan 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.9-1
+- 0.9, license changed to GPLv2+.
+- Patch to improve translations.
+- Patch to fix port conversion in accepted/denied syslog messages.
+- Patch to fix missing HTTP headers on access denied responses.
+
* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8-18
- BuildRequires: gawk for extracting APIVERSION.
--- vdr-wapd-0.8-1338i18n.patch DELETED ---
--- vdr-wapd-0.8-1341.patch DELETED ---
More information about the fedora-extras-commits
mailing list