Index: popper/Makefile.in
--- popper/Makefile.in.orig	2011-05-30 21:13:39.000000000 +0200
+++ popper/Makefile.in	2015-01-12 09:17:25.456366192 +0100
@@ -210,12 +210,10 @@
 	${CC}   ${OBJS} ${MISSING_OBJS} -o popper \
 	        ${mmangle_dir}/libmangle.a \
 	        -I${common_srcdir} ${common_dir}/libcommon.a \
-	        ${LIBS} ${LDFLAGS}
+	        ${LDFLAGS} ${LIBS}
 
 popauth: ${POPAUTHOBJS} ${MISSING_OBJS}
-	${CC}  -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} \
-	       ${DBM_LIBS} ${MISSING_OBJS} \
-		${common_dir}/libcommon.a
+	${CC}  -o popauth ${POPAUTHOBJS} ${common_dir}/libcommon.a ${NETWORK_LIBS} ${DBM_LIBS} ${MISSING_OBJS}
 
 poppassd: common_library
 	cd ${password_dir} && ${MAKE} all
Index: popper/main.c
--- popper/main.c.orig	2011-05-30 21:13:39.000000000 +0200
+++ popper/main.c	2015-01-12 09:17:25.456366192 +0100
@@ -655,6 +655,22 @@
 
 #endif /* not _DEBUG */
 
+#ifdef PIDFILE
+    /*
+     * Write PID file. -- RSE
+     */
+    {
+        pid_t pid;
+        FILE *fp;
+
+        pid = getpid();
+        if ((fp = fopen(PIDFILE, "w")) == NULL)
+            err_dump(HERE, "Can't write pidfile '%s'", PIDFILE);
+        fprintf(fp, "%ld\n", (long)pid);
+        fclose(fp);
+    }
+#endif
+
     memset ( &hints, 0, sizeof(hints) );
     hints.ai_socktype = SOCK_STREAM;
 #ifdef INET6
Index: popper/pop_config.c
--- popper/pop_config.c.orig	2011-05-30 21:13:39.000000000 +0200
+++ popper/pop_config.c	2015-01-12 09:18:28.597637080 +0100
@@ -433,7 +433,9 @@
 static mnemonic_map mnem_map_tls_vers [] =
 {
     { "default"         , QPOP_TLSvDEFAULT      }, 
+#if 0
     { "SSLv2"           , QPOP_SSLv2            },
+#endif
     { "SSLv3"           , QPOP_SSLv3            }, 
     { "TLSv1"           , QPOP_TLSv1            },
     { "SSLv23"          , QPOP_SSLv23           },
Index: popper/pop_dropcopy.c
--- popper/pop_dropcopy.c.orig	2011-05-30 21:13:39.000000000 +0200
+++ popper/pop_dropcopy.c	2015-01-12 09:17:25.466233438 +0100
@@ -1245,6 +1245,10 @@
             return pop_msg ( p, POP_FAILURE, HERE,
                              "[SYS/TEMP] Unable to get temp drop name" );
         
+        /*
+         *  OpenPKG: enforce usage of "spool-dir" configuration option
+         */
+#if 0
         if ( stat ( p->temp_drop, &mybuf ) == -1 || mybuf.st_size <= 0 ) {
             if ( genpath ( p, 
                            p->temp_drop, 
@@ -1253,6 +1257,7 @@
                 return pop_msg ( p, POP_FAILURE, HERE,
                                  "[SYS/TEMP] Unable to get temp drop name" );
         }
+#endif
     }
     else {
         /*
Index: popper/pop_tls_openssl.c
--- popper/pop_tls_openssl.c.orig	2011-05-30 21:13:40.000000000 +0200
+++ popper/pop_tls_openssl.c	2015-01-12 09:17:25.466233438 +0100
@@ -318,10 +318,12 @@
             pTLS->m_OpenSSLmeth = SSLv23_server_method();
             break;
 
+#if 0
         case QPOP_SSLv2:       /* SSL version 2 only */
             DEBUG_LOG0 ( pPOP, "...setting method to SSLv2_server_method" );
             pTLS->m_OpenSSLmeth = SSLv2_server_method();
             break;
+#endif
 
         case QPOP_SSLv3:       /* SSL version 3 only */
             DEBUG_LOG0 ( pPOP, "...setting method to SSLv3_server_method" );