Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
eduroam
radsecproxy-uninett
Commits
4cd1561b
Commit
4cd1561b
authored
Sep 22, 2016
by
Kolbjørn Barmen
Browse files
Shit that works
parent
caa84613
Changes
7
Hide whitespace changes
Inline
Side-by-side
Dockerfile
0 → 100644
View file @
4cd1561b
FROM
debian:jessie
WORKDIR
/root/
COPY
patches patches
COPY
build.sh build.sh
RUN
./build.sh
CMD
tar c *.deb
README.md
View file @
4cd1561b
Radsecproxy med patcher for UNINETT/eduroame
# Build script for Radsecproxy at UNINETT
This script will generate a .deb package for Radsecproxy.
## Usage
Edit
**build.sh**
and set the desired version number for Radsecproxy.
```
bash
docker build
--no-cache
-t
radsecproxy-debbuild
.
docker run
-i
radsecproxy-debbuild |
tar
x
```
build.sh
0 → 100755
View file @
4cd1561b
#!/bin/sh
set
-e
# set -x
export
TZ
=
"Europe/Oslo"
package
=
"radsecproxy"
version
=
"1.6.8"
now
=
$(
date
+
"%a, %d %b %Y %T %z"
)
here
=
$(
pwd
)
export
DEBIAN_FRONTEND
=
noninteractive
cat
>>
/etc/apt/sources.list
<<
EOF
deb-src http://httpredir.debian.org/debian jessie main
deb-src http://httpredir.debian.org/debian jessie-updates main
deb-src http://security.debian.org jessie/updates main
EOF
apt-get update
apt-get
-y
upgrade
apt-get
-y
install
curl debhelper dh-autoreconf dh-systemd autotools-dev libssl-dev nettle-dev docbook2x
curl
-o
"
${
package
}
"
_
"
${
version
}
"
.orig.tar.gz
"https://software.nordu.net/
${
package
}
/
${
package
}
-
${
version
}
.tar.gz"
tar
xzf
"
${
package
}
"
_
"
${
version
}
"
.orig.tar.gz
apt-get
source
${
package
}
tar
xf
"
${
package
}
"
_
*
.debian.tar.xz
-C
"
${
package
}
"
-
"
${
version
}
/"
cp
patches/
*
"
${
package
}
"
-
"
${
version
}
"
/debian/patches/
for
patch
in
patches/
*
;
do
echo
${
patch
##*/
}
done
>>
"
${
package
}
"
-
"
${
version
}
"
/debian/patches/series
cat
>
changelog
<<
EOF
radsecproxy (
${
version
}
-uninett1) unstable; urgency=medium
* New upstream release, with uninett-specific patches
-- Kolbjørn Barmen <debian@kolla.no>
${
now
}
EOF
cat
"
${
package
}
-
${
version
}
/debian/changelog"
>>
changelog
cat
changelog
>
"
${
package
}
-
${
version
}
/debian/changelog"
cd
"
${
package
}
-
${
version
}
/"
dpkg-buildpackage
cd
"
${
here
}
"
patches/patch-aa
View file @
4cd1561b
...
@@ -2,11 +2,11 @@ $NetBSD$
...
@@ -2,11 +2,11 @@ $NetBSD$
These syslog messages occur way too often. ...and since Kolla
These syslog messages occur way too often. ...and since Kolla
likes to run with full debugging turned on, eliminate these so
likes to run with full debugging turned on, eliminate these so
that we don't fill the /var file system.
that we don't fill the /var
/log
file system.
--- radsecproxy.c
.orig
201
0-0
6-03
14:44:10
.000000000 +0
2
00
---
a/
radsecproxy.c 2016-03
-14 15:14:55
.000000000 +0
1
00
+++ radsecproxy.c
+++
b/
radsecproxy.c
2016-08-03 15:27:28.504000000 +0200
@@ -4
19
,7 +4
19
,9 @@
struct request *newrqref(struct request
@@ -4
33
,7 +4
33
,9 @@
void freerq(struct request *rq) {
void freerq(struct request *rq) {
if (!rq)
if (!rq)
return;
return;
...
...
patches/patch-ab
View file @
4cd1561b
...
@@ -2,11 +2,11 @@ $NetBSD$
...
@@ -2,11 +2,11 @@ $NetBSD$
These syslog messages occur way too often. ...and since Kolla
These syslog messages occur way too often. ...and since Kolla
likes to run with full debugging turned on, eliminate these so
likes to run with full debugging turned on, eliminate these so
that we don't fill the /var file system.
that we don't fill the /var
/log
file system.
--- udp.c
.orig
201
0-0
6-03
14:44:11
.000000000 +0
2
00
---
a/
udp.c 2016-03
-14 15:14:55
.000000000 +0
1
00
+++ udp.c
+++
b/
udp.c
2016-08-03 15:28:31.056000000 +0200
@@ -30
8
,7 +30
8
,9 @@
void *udpserverwr(void *arg) {
@@ -3
1
0,7 +3
1
0,9 @@
if (sendto(reply->udpsock, reply->replybuf, RADLEN(reply->replybuf), 0, (struct sockaddr *)&to, SOCKADDR_SIZE(to)) < 0)
if (sendto(reply->udpsock, reply->replybuf, RADLEN(reply->replybuf), 0, (struct sockaddr *)&to, SOCKADDR_SIZE(to)) < 0)
debug(DBG_WARN, "udpserverwr: send failed");
debug(DBG_WARN, "udpserverwr: send failed");
}
}
...
...
patches/patch-ac
View file @
4cd1561b
...
@@ -2,9 +2,9 @@ $NetBSD$
...
@@ -2,9 +2,9 @@ $NetBSD$
Use NOTICE for requests as well
Use NOTICE for requests as well
--- radsecproxy.c
.orig 2010-12-23 14:01:35.000
000000 +0
1
00
---
a/
radsecproxy.c
2016-08-03 15:27:28.504
000000 +0
2
00
+++ radsecproxy.c
+++
b/
radsecproxy.c
2016-08-03 15:29:01.328000000 +0200
@@ -12
61
,12 +12
61
,12 @@
@@ -12
84
,12 +12
84
,12 @@
attr = radmsg_gettype(msg, RAD_Attr_User_Name);
attr = radmsg_gettype(msg, RAD_Attr_User_Name);
if (!attr) {
if (!attr) {
...
@@ -19,7 +19,7 @@ Use NOTICE for requests as well
...
@@ -19,7 +19,7 @@ Use NOTICE for requests as well
free(username);
free(username);
}
}
@@ -1
469
,7 +1
469
,7 @@
@@ -1
523
,7 +1
523
,7 @@
userascii = radattr2ascii(attr);
userascii = radattr2ascii(attr);
if (!userascii)
if (!userascii)
goto rmclrqexit;
goto rmclrqexit;
...
...
patches/patch-ad
View file @
4cd1561b
...
@@ -3,9 +3,9 @@ $NetBSD$
...
@@ -3,9 +3,9 @@ $NetBSD$
Don't overwrite LDFLAGS, only add to it. We might get flags
Don't overwrite LDFLAGS, only add to it. We might get flags
via the build environment, but not during the configure stage.
via the build environment, but not during the configure stage.
--- Makefile.in
.orig
201
2
-0
4
-1
6
1
3:08:14
.000000000 +0
0
00
---
a/
Makefile.in 201
6
-0
3
-1
4
1
5:15:08
.000000000 +0
1
00
+++ Makefile.in
+++
b/
Makefile.in
2016-08-03 15:29:37.344000000 +0200
@@ -
207
,7 +
207
,7 @@
INSTALL_DATA = @INSTALL_DATA@
@@ -
310
,7 +
310
,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment