Merge branch 'rawhide' into epel8
This commit is contained in:
Tim Semeijn
commit
e235647e93
4 changed files with 118 additions and 32 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -5,3 +5,4 @@
|
|||
/3proxy-0.8.2.tar.gz
|
||||
/3proxy-0.8.12.tar.gz
|
||||
/3proxy-0.8.13.tar.gz
|
||||
/3proxy-0.9.4.tar.gz
|
||||
|
|
|
|||
48
3proxy-0.9.4-poll-build.patch
Normal file
48
3proxy-0.9.4-poll-build.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
--- src/common.c
|
||||
+++ src/common.c
|
||||
@@ -156,7 +156,7 @@
|
||||
WINAPI
|
||||
#endif
|
||||
|
||||
- mypoll(struct mypollfd *fds, unsigned int nfds, int timeout){
|
||||
+ mypoll(struct mypollfd *fds, nfds_t nfds, int timeout){
|
||||
fd_set readfd;
|
||||
fd_set writefd;
|
||||
fd_set oobfd;
|
||||
--- src/structures.h
|
||||
+++ src/structures.h
|
||||
@@ -66,6 +66,7 @@
|
||||
#ifdef WITH_POLL
|
||||
#include <poll.h>
|
||||
#else
|
||||
+typedef unsigned int nfds_t;
|
||||
#ifdef WITH_WSAPOLL
|
||||
|
||||
#define poll(A,B,C) WSAPoll(A,B,C)
|
||||
@@ -81,7 +82,7 @@
|
||||
#ifdef _WIN32
|
||||
WINAPI
|
||||
#endif
|
||||
- mypoll(struct mypollfd *fds, unsigned int nfds, int timeout);
|
||||
+ mypoll(struct mypollfd *fds, nfds_t nfds, int timeout);
|
||||
#ifndef POLLIN
|
||||
#define POLLIN 1
|
||||
#endif
|
||||
@@ -694,7 +695,7 @@
|
||||
int (WINAPI *_getsockname)(SOCKET s, struct sockaddr * name, int * namelen);
|
||||
int (WINAPI *_getsockopt)(SOCKET s, int level, int optname, char * optval, int * optlen);
|
||||
int (WINAPI *_setsockopt)(SOCKET s, int level, int optname, const char *optval, int optlen);
|
||||
- int (WINAPI *_poll)(struct pollfd *fds, unsigned int nfds, int timeout);
|
||||
+ int (WINAPI *_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
|
||||
int (WINAPI *_send)(SOCKET s, const char *msg, int len, int flags);
|
||||
int (WINAPI *_sendto)(SOCKET s, const char *msg, int len, int flags, const struct sockaddr *to, int tolen);
|
||||
int (WINAPI *_recv)(SOCKET s, char *buf, int len, int flags);
|
||||
@@ -711,7 +712,7 @@
|
||||
int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen);
|
||||
int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen);
|
||||
int (*_setsockopt)(int s, int level, int optname, const void *optval, socklen_t optlen);
|
||||
- int (*_poll)(struct pollfd *fds, unsigned int nfds, int timeout);
|
||||
+ int (*_poll)(struct pollfd *fds, nfds_t nfds, int timeout);
|
||||
size_t (*_send)(SOCKET s, const void *msg, size_t len, int flags);
|
||||
size_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen);
|
||||
size_t (*_recv)(SOCKET s, void *buf, size_t len, int flags);
|
||||
99
3proxy.spec
99
3proxy.spec
|
|
@ -1,37 +1,27 @@
|
|||
# To build on Fedora 14 due to https://bugzilla.redhat.com/show_bug.cgi?id=715580
|
||||
#% global _unitdir /lib/systemd/system
|
||||
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: 3proxy
|
||||
Version: 0.8.13
|
||||
Release: 1%{?dist}
|
||||
Version: 0.9.4
|
||||
Release: 2%{?dist}
|
||||
|
||||
Summary: Tiny but very powerful proxy
|
||||
Summary(ru): Маленький, но крайне мощный прокси-сервер
|
||||
|
||||
License: BSD or ASL 2.0 or GPLv2+ or LGPLv2+
|
||||
License: BSD-3-Clause OR Apache-2.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later
|
||||
Url: http://3proxy.ru/?l=EN
|
||||
|
||||
Source0: https://github.com/z3APA3A/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source2: 3proxy.cfg
|
||||
Source3: 3proxy.service
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: make
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
|
||||
# I correct config path in man only. It is fully Fedora related.
|
||||
Patch0: 3proxy-0.6.1-config-path.patch
|
||||
|
||||
BuildRequires: systemd
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
# This is actually needed for the %triggerun script but Requires(triggerun)
|
||||
# is not valid. We can use %post because this particular %triggerun script
|
||||
# should fire just after this package is installed.
|
||||
Requires(post): systemd
|
||||
Obsoletes: 3proxy-sysvinit < 0.8.12
|
||||
|
||||
# Fixes *_poll build error
|
||||
Patch1: 3proxy-0.9.4-poll-build.patch
|
||||
|
||||
%description
|
||||
%{name} -- light proxy server.
|
||||
|
|
@ -53,7 +43,7 @@ SOCKS v5, FTP, POP3, UDP и TCP проброс портов (portmapping), сп
|
|||
%autosetup -p0
|
||||
|
||||
# To use "fedora" CFLAGS (exported)
|
||||
sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile.Linux
|
||||
sed -i -e "s/^CFLAGS =/CFLAGS +=/" Makefile.Linux
|
||||
|
||||
%build
|
||||
make -f Makefile.Linux
|
||||
|
|
@ -63,16 +53,15 @@ mkdir -p %{buildroot}%{_sysconfdir}
|
|||
mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/
|
||||
mkdir -p %{buildroot}%{_mandir}/man{3,8}
|
||||
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
|
||||
install -m755 -D src/%{name} %{buildroot}%{_bindir}/%{name}
|
||||
install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
|
||||
install -m755 -D src/ftppr %{buildroot}%{_bindir}/ftppr
|
||||
install -m755 -D src/mycrypt %{buildroot}%{_bindir}/mycrypt
|
||||
install -m755 -D src/pop3p %{buildroot}%{_bindir}/pop3p
|
||||
install -m755 -D src/%{name} %{buildroot}%{_bindir}/%{name}
|
||||
install -m755 -D src/proxy %{buildroot}%{_bindir}/htproxy
|
||||
install -m755 -D src/socks %{buildroot}%{_bindir}/socks
|
||||
install -m755 -D src/tcppm %{buildroot}%{_bindir}/tcppm
|
||||
install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm
|
||||
install -m755 -D bin/%{name} %{buildroot}%{_bindir}/%{name}
|
||||
install -m755 -D bin/ftppr %{buildroot}%{_bindir}/ftppr
|
||||
install -m755 -D bin/mycrypt %{buildroot}%{_bindir}/mycrypt
|
||||
install -m755 -D bin/pop3p %{buildroot}%{_bindir}/pop3p
|
||||
install -m755 -D bin/proxy %{buildroot}%{_bindir}/htproxy
|
||||
install -m755 -D bin/smtpp %{buildroot}%{_bindir}/smtpp
|
||||
install -m755 -D bin/socks %{buildroot}%{_bindir}/socks
|
||||
install -m755 -D bin/tcppm %{buildroot}%{_bindir}/tcppm
|
||||
install -m755 -D bin/udppm %{buildroot}%{_bindir}/udppm
|
||||
|
||||
install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
|
||||
install -pD -m755 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
|
||||
|
|
@ -93,7 +82,7 @@ done
|
|||
|
||||
%files
|
||||
%license copying
|
||||
%doc README authors Release.notes
|
||||
%doc README authors
|
||||
%{_bindir}/*
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.cfg
|
||||
%{_localstatedir}/log/%{name}
|
||||
|
|
@ -102,6 +91,54 @@ done
|
|||
%{_unitdir}/%{name}.service
|
||||
|
||||
%changelog
|
||||
* Tue Feb 20 2024 Tim Semeijn <tim@goat.re> - 0.9.4-2
|
||||
- Fix failing builds with *_poll build patch (3proxy-0.9.4-poll-build.patch)
|
||||
- Convert license to SPDX
|
||||
|
||||
* Sun Feb 11 2024 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.9.4-1
|
||||
- Update to 0.9.4, fixes rhbz#1888503
|
||||
- Fix FTBFS, fixes rhbz#2261821
|
||||
|
||||
* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.8.13-5
|
||||
- Rebuilt for updated fedora-rpm-macros.
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
|
||||
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.13-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Oct 22 2019 Pavel Alexeev <Pahan@Hubbitus.info> - 0.8.13-1
|
||||
- Update to 0.8.13 version (bz#1742435).
|
||||
- Try build on epel8 (bz#1757824).
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (3proxy-0.8.13.tar.gz) = 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79
|
||||
SHA512 (3proxy-0.9.4.tar.gz) = d3316f6ee1217e580ce593a7bfd9d76672487a89862f247373b0acf3ea207887c758168e33b25db9fc974063deab0826c20d455cab2536d03eee49d8bddda6b5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue