4
Fork 0

Fixed issues with building Debian package

This commit is contained in:
R3ABM Artem 2016-07-25 11:46:59 +04:00
parent 9094b61931
commit d39c2fd8a2
6 changed files with 26 additions and 14 deletions

View file

@ -539,6 +539,13 @@ int main(int argc, const char* argv[])
continue;
}
if (type == REWIND_TYPE_ADDRESS_NOTICE)
{
socketOptionValue = false;
setsockopt(remoteHandle, IPPROTO_IP, IP_PKTINFO, &socketOptionValue, sizeof(socketOptionValue));
continue;
}
if (type == REWIND_TYPE_REPORT)
{
incomingBuffer->data[length] = '\0';
@ -726,7 +733,7 @@ int main(int argc, const char* argv[])
data->number = htole32(repeaterNumber);
data->service = REWIND_SERVICE_CRONOS_AGENT;
length += sprintf(data->version, "CronosAgent " STRING(VERSION) " " BUILD);
length += sprintf(data->description, "CronosAgent " STRING(VERSION) " " BUILD);
outgoingBuffer->type = htole16(REWIND_TYPE_KEEP_ALIVE);
outgoingBuffer->flags = htole16(REWIND_FLAG_DEFAULT_SET);
@ -769,6 +776,11 @@ int main(int argc, const char* argv[])
running = false;
break;
}
// SIGHUP
socketOptionValue = true;
setsockopt(remoteHandle, IPPROTO_IP, IP_PKTINFO, &socketOptionValue, sizeof(socketOptionValue));
}
}
}

View file

@ -53,9 +53,9 @@ extern "C"
struct RewindVersionData
{
uint32_t number; // Remote ID
uint8_t service; // REWIND_SERVICE_*
char version[0]; // Software version
uint32_t number; // Remote ID
uint8_t service; // REWIND_SERVICE_*
char description[0]; // Software name and version
};
struct RewindAddressData

View file

@ -2,14 +2,14 @@
FILE=$(mktemp)
VERSION=(grep -o -E "[0-9]+" Version.h)
DATE=$(date +"%a, %d %b %a %H:%M:%S %z")
DATE=$(date +"%a, %d %b %Y %H:%M:%S %z")
echo "cronosagent ${VERSION} none; urgency=low" >> ${FILE}
echo "cronosagent (${VERSION}) none; urgency=low" >> ${FILE}
echo >> ${FILE}
echo "* Daily build" >> ${FILE}
echo " * Daily build" >> ${FILE}
echo >> ${FILE}
echo " -- Artem Prilutskiy <cyanide.burnout@gmail.com> ${DATE}" >> ${FILE}
echo >> ${FILE}
test -f debian/changelog && cat debian/changelog >> ${FILE}
# test -f debian/changelog && cat debian/changelog >> ${FILE}
mv ${FILE} debian/changelog

View file

@ -1,8 +1,8 @@
#!/bin/bash
REPEATER_NUMBER=250304
REPEATER_NUMBER=123456
REPEATER_ADDRESS=172.33.20.136
SERVER_ADDRESS=aesyle.dstar.su
SERVER_ADDRESS=master.dstar.su
SERVER_PASSWORD=passw0rd
SERVICE_MODE=1

6
debian/changelog vendored
View file

@ -1,6 +1,6 @@
cronosagent grep none; urgency=low
cronosagent (grep) none; urgency=low
* Daily build
* Daily build
-- Artem Prilutskiy <cyanide.burnout@gmail.com> пт, 08 июл пт 18:19:40 +0300
-- Artem Prilutskiy <cyanide.burnout@gmail.com> Mon, 25 Jul 2016 11:44:12 +0400

2
debian/control vendored
View file

@ -3,7 +3,7 @@ Section: unknown
Priority: extra
Maintainer: Artem Prilutskiy <cyanide.burnout@gmail.com>
Build-Depends:
debhelper (>= 5), libconfig-dev (>= 1.3), libssl-dev
debhelper (>= 5), libssl-dev
Standards-Version: 3.8.4
Package: cronosagent