retitle 440996 memlockd: NMU diff for 0.03-0.1, 0.03-0.2 thanks Here's the diff from 0.03 to 0.03-0.2. Uploaded to DELAYED/7-day.
-- Robert Edmonds [EMAIL PROTECTED]
diff -pru orig/memlockd-0.03/Makefile memlockd-0.03/Makefile
--- orig/memlockd-0.03/Makefile 2007-02-14 21:19:54.000000000 -0500
+++ memlockd-0.03/Makefile 2007-09-09 17:17:51.627282531 -0400
@@ -5,7 +5,7 @@ WFLAGS=-Wall -W -Wshadow -Wpointer-arith
memlockd: memlockd.cpp
- gcc -O2 memlockd.cpp -o memlockd $(WFLAGS) -lstdc++
+ g++ -O2 memlockd.cpp -o memlockd $(WFLAGS)
clean:
rm -f memlockd
diff -pru orig/memlockd-0.03/changes.txt memlockd-0.03/changes.txt
--- orig/memlockd-0.03/changes.txt 2007-03-13 04:12:12.000000000 -0400
+++ memlockd-0.03/changes.txt 2007-09-09 17:31:26.429715476 -0400
@@ -1,3 +1,19 @@
+memlockd (0.03-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Compile with g++, not gcc -lstdc++; closes: #441449.
+
+ -- Robert S. Edmonds <[EMAIL PROTECTED]> Sun, 09 Sep 2007 17:17:20 -0400
+
+memlockd (0.03-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Use sysconf(_SC_PAGESIZE) instead of PAGE_SIZE; closes: #418666.
+ * Add dependency on adduser; closes: #431529.
+ * Use invoke-rc.d; closes: #440574.
+
+ -- Robert S. Edmonds <[EMAIL PROTECTED]> Wed, 05 Sep 2007 19:34:22 -0400
+
memlockd (0.03) unstable; urgency=medium
* Fixed section and description.
diff -pru orig/memlockd-0.03/debian/changelog memlockd-0.03/debian/changelog
--- orig/memlockd-0.03/debian/changelog 2007-03-13 04:12:12.000000000 -0400
+++ memlockd-0.03/debian/changelog 2007-09-09 17:31:26.429715476 -0400
@@ -1,3 +1,19 @@
+memlockd (0.03-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Compile with g++, not gcc -lstdc++; closes: #441449.
+
+ -- Robert S. Edmonds <[EMAIL PROTECTED]> Sun, 09 Sep 2007 17:17:20 -0400
+
+memlockd (0.03-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Use sysconf(_SC_PAGESIZE) instead of PAGE_SIZE; closes: #418666.
+ * Add dependency on adduser; closes: #431529.
+ * Use invoke-rc.d; closes: #440574.
+
+ -- Robert S. Edmonds <[EMAIL PROTECTED]> Wed, 05 Sep 2007 19:34:22 -0400
+
memlockd (0.03) unstable; urgency=medium
* Fixed section and description.
diff -pru orig/memlockd-0.03/debian/control memlockd-0.03/debian/control
--- orig/memlockd-0.03/debian/control 2007-03-12 19:52:35.000000000 -0400
+++ memlockd-0.03/debian/control 2007-09-09 17:16:51.000000000 -0400
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
Package: memlockd
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
Description: daemon to lock files into RAM
When a system starts paging excessively it may be impossible for the sysadmin
to login for the purpose of killing the runaway processes (sometimes the
diff -pru orig/memlockd-0.03/debian/postinst memlockd-0.03/debian/postinst
--- orig/memlockd-0.03/debian/postinst 2007-03-13 04:10:19.000000000 -0400
+++ memlockd-0.03/debian/postinst 2007-09-09 17:16:51.000000000 -0400
@@ -31,7 +31,6 @@ case "$1" in
fi
update-rc.d memlockd start 75 2 3 4 5 . stop 05 0 1 6 . >/dev/null || true
- /etc/init.d/memlockd restart
;;
@@ -44,10 +43,11 @@ case "$1" in
;;
esac
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
+if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d memlockd restart
+else
+ /etc/init.d/memlockd restart
+fi
exit 0
diff -pru orig/memlockd-0.03/memlockd.cpp memlockd-0.03/memlockd.cpp
--- orig/memlockd-0.03/memlockd.cpp 2007-03-13 03:58:29.000000000 -0400
+++ memlockd-0.03/memlockd.cpp 2007-09-09 17:16:51.000000000 -0400
@@ -33,6 +33,7 @@ int num_files = 0;
int num_new_files = 0;
const char * config = "/etc/memlockd.cfg";
int debug = 0;
+int page_size = 0;
uid_t uid = 0;
gid_t gid = 0;
@@ -83,9 +84,9 @@ int open_map(int fd, struct stat *sb, co
close(fd);
return 0;
}
- if(sb->st_size % PAGE_SIZE)
- new_files[num_new_files].map_size = sb->st_size - (sb->st_size % PAGE_SIZE)
- + PAGE_SIZE;
+ if(sb->st_size % page_size)
+ new_files[num_new_files].map_size = sb->st_size - (sb->st_size % page_size)
+ + page_size;
else
new_files[num_new_files].map_size = sb->st_size;
new_files[num_new_files].fd = fd;
@@ -267,6 +268,7 @@ int main(int argc, char **argv)
{
int c;
pid_t old_pid = 0;
+ page_size = (int) sysconf(_SC_PAGESIZE);
while(-1 != (c = getopt(argc, argv, "dc:u:")) )
{
switch(char(c))
signature.asc
Description: Digital signature
